Commit Graph
10629 Commits
Author SHA1 Message Date
Jacob Vosmaer ffece96dd1 Spell out rake tasks for omnibus-gitlab 2014-06-23 10:38:22 +02:00
Sytse Sijbrandij 882c7b50b8 Allow for the readme not to exist. 2014-06-23 09:50:29 +02:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Sytse Sijbrandij 9f36888b99 Link to readme from description if you don't have edit rights on the repository. 2014-06-23 09:16:38 +02:00
Dmitriy Zaporozhets 73c1030da1 Merge branch 'fix-go-meta-tag' into 'master'
Fix go meta tag

See https://github.com/gitlabhq/gitlabhq/pull/5958#issuecomment-45397555
2014-06-23 06:39:58 +00:00
Dmitriy Zaporozhets 68e4a68223 Merge branch 'gitlab_cache_clear' into 'master'
Patch `rake cache:clear` for large amounts of keys
2014-06-23 06:39:20 +00:00
Dmitriy Zaporozhets 331778664b Merge branch 'more-swap' into 'master'
More swap is also an option
2014-06-23 06:38:43 +00:00
Dmitriy Zaporozhets 5aaa35656e Merge branch 'redirect_after_login' into 'master'
Redirect after login
2014-06-23 06:38:24 +00:00
Dmitriy Zaporozhets 5b8c176767 Merge branch 'html-semantic' into 'master'
Use html5 tags for better semantic
2014-06-23 06:37:35 +00:00
Dmitriy Zaporozhets fe00d0f50d Merge branch 'mr-diff-loading-spinner' into 'master'
MR diff loading spinner

When you click `Changes` tab if diff is big - you now see loading spinner
2014-06-23 06:37:14 +00:00
Dmitriy Zaporozhets 0759266c15 Merge branch 'ui-improvements' into 'master'
Ui improvements
2014-06-23 06:36:51 +00:00
Dmitriy Zaporozhets 860785a45e Merge branch 'skip_to_buttons_on_tab_in_issues_page' into 'master'
Skip to buttons on tabbing in issues page

This will skip tabbing right to "Add comment" or "close" buttons.

http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribute

For tabindex:

```
If the value is a negative integer
The user agent must set the element's tabindex focus flag, but should not allow the element to be reached using sequential focus navigation.
```
2014-06-23 06:36:19 +00:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master'
Remove observers from application

Part of #1133
2014-06-23 06:36:08 +00:00
Dmitriy Zaporozhets 88659eebb0 Merge branch 'regression-issue-on-rc' into 'master'
Regression issue on rc
2014-06-23 06:35:38 +00:00
Christophe Poulette 2d71780705 Small ui fix 2014-06-22 18:24:50 +02:00
Jeroen van Baarsen e364a852af Call every service, even if one fails
When one service fails, we dont want to have all of them failing. This
fixes this problem by catching all the errors, and writing them to the
error log.

Fixes: #5803

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-22 14:48:31 +02:00
Sytse Sijbrandij 692ecdb81c Merge pull request #7165 from Razer6/fix/init_script
Fixes #7163, copy init script while upgrading (master branch)
2014-06-22 14:16:34 +02:00
Sytse Sijbrandij 6f7cf8692c Create the regression issue when the rc is released. 2014-06-22 14:03:52 +02:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files.
Present in the large majority of files of each respective type.
2014-06-21 11:20:22 +02:00
Ciro Santilli 83f4735b57 Replace HTML5 obsolete center element with CSS.
Fix #6901. Would generate invalid HTML5.
2014-06-21 09:43:00 +02:00
Robert Schilling 1d8c32982d Fixes #7148, Add 'create milestone permission' to docs 2014-06-21 00:05:27 +02:00
Robert Schilling 9ba2e1873b Fixes #7163, copy init script while upgrading 2014-06-20 21:38:08 +02:00
Jacob Vosmaer cf0a370274 Patch rake cache:clear for large amounts of keys 2014-06-20 13:58:57 +02:00
Olivier Lambert 8a35660e40 Missing quote in the install doc
Just a minor fix ;)
2014-06-20 13:48:14 +02:00
Dmitriy Zaporozhets d1e424bd5c Bump version to 7.0.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.0.0
2014-06-20 13:37:33 +03:00
Dmitriy Zaporozhets 71feb75782 Merge branch 'fix-permissions' into 'master'
Fix permissions

Fixes #1358
2014-06-20 10:36:25 +00:00
Marin Jankovski c83004a0f1 Remove milestone observer from db fixture. 2014-06-20 12:01:22 +02:00
Dmitriy Zaporozhets e2552475e2 Merge branch 'update-guides' into 'master'
Mention all update guides in monthly release doc

Fixes #1328
2014-06-20 09:58:44 +00:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:54:03 +03:00
Dmitriy Zaporozhets 8401ec56e3 Show spinner when loading MR diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:17:06 +03:00
Dmitriy Zaporozhets 995d193d32 Merge branch '6.0-to-7.0' into 'master'
Create 6.0-to-7.0 update guide
2014-06-20 08:48:31 +00:00
Jacob Vosmaer 7d04d460c6 The Wall is deprecated in 7.0 2014-06-20 10:44:42 +02:00
Jacob Vosmaer 1065f4616c Create 6.0-to-7.0 update guide 2014-06-20 09:26:12 +02:00
Marin Jankovski db88797ef9 Fix test 2014-06-19 16:51:36 +02:00
Marin Jankovski 26d1bd7c2a Set return url as param. 2014-06-19 14:20:25 +02:00
Dmitriy Zaporozhets 55512a80a6 During release we need to create several update guides
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 14:40:42 +03:00
Dmitriy Zaporozhets e59e48d75a Merge branch 'fix-500-admin-transfer' into 'master'
Fix 500 error when transfer project from admin area

Fixes #1349
2014-06-19 11:16:42 +00:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 13:20:42 +03:00
Marin Jankovski 2c3626884e Test the redirect after sign in. 2014-06-19 11:24:59 +02:00
Marin Jankovski a1eb1ad168 Redirect back to current page after sign in. 2014-06-19 11:24:59 +02:00
Boris HUISGEN bac7d17c7b Fix LDAP TLS authentication 2014-06-19 10:41:23 +02:00
Dmitriy Zaporozhets ab5cac7b9a Improve design page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 10:14:59 +03:00
Dmitriy Zaporozhets 2a52be9c3e Move nprogess color to variable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 09:58:42 +03:00
Dmitriy Zaporozhets b64351478a Merge branch 'revert_email_thread' into 'master'
Revert email threading rewrite

The 'to:' address introduced by this merge caused a flood of email going to an admin account for GitLab.com. This feature should not be shipped as-is.
2014-06-19 06:28:37 +00:00
Sytse Sijbrandij 98e53b816f People report that 2GB of swap on Digital Ocean also does the trick. 2014-06-19 08:22:58 +02:00
Dmitriy Zaporozhets 6a50414c57 Replace bg_style_color with bg_primary
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 00:17:38 +03:00
Dmitriy Zaporozhets 3ee7209a68 Move commit css to commits section. Remove box-shadow for text fields to match global style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-18 23:53:19 +03:00
Dmitriy Zaporozhets 4e145bd856 Move basic header styles to theme file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-18 23:43:33 +03:00
Dmitriy Zaporozhets 67934145e8 Merge pull request #7146 from zzet/patch-11
Fix mistake in reference_jira_issue method (markdown)
2014-06-18 18:12:54 +03:00
Sytse Sijbrandij e0c725c55f Move Go header to the top of the head to work around broken Go parsing. 2014-06-18 16:18:38 +02:00