summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-062-10/+0
| | | | This reverts commit af44c65030a1fbc4e29c3cf51e4d3c33b9666201.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0216-31/+115
|\
| * Merge branch 'add-unlock-access' into 'master'Dmitriy Zaporozhets2015-07-026-0/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for unlocking users in admin settings ### What does this MR do? This MR gives the ability to unlock a user from the Admin panel. ### Why was this MR needed? If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely). ### Screenshots #### Admin index page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png) #### Admin edit user page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png) ### What are the relevant issue numbers? This replaces !288. Closes https://github.com/gitlabhq/gitlabhq/issues/9381 See merge request !922
| | * Add support for unlocking users in admin settingsStan Hu2015-07-026-0/+35
| | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9381
| * | Merge branch 'feature/recent_order' into 'master'Hannes Rosenögger2015-07-022-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'created_at DESC' is performed twice If you are already sorting in descending order in the created_at, it is run twice when you run the .recent. It has passed in the string 'created_at DESC'. Ruby on Rails is directly given to the SQL. It is a slow query in MySQL. See merge request !825
| | * | add CHANGELOGcatatsuy2015-07-021-0/+1
| | | |
| | * | 'created_at DESC' is performed twicecatatsuy2015-07-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | If you are already sorting in descending order in the created_at, it is run twice when you run the .recent. It has passed in the string 'created_at DESC'. Ruby on Rails is directly given to the SQL. It is a slow query in MySQL.
| * | Merge branch 'anonymous-applications' into 'master'Dmitriy Zaporozhets2015-07-025-4/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly show anonymous authorized applications under Profile > Applications. Fixes #1907. Access tokens that were created using the ["Resource Owner Password Credentials" flow](http://doc.gitlab.com/ce/api/oauth2.html#resource-owner-password-credentials) by the user entering their username and password don't have a connected application, so the Profile > Applications page used to crash. These tokens are now rendered as "Anonymous" and can be revoked. ![Screen_Shot_2015-07-02_at_11.53.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0fb044ce1fbf5d5e2825c3abee7763ee/Screen_Shot_2015-07-02_at_11.53.55.png) See merge request !924
| | * | Correctly show anonymous authorized applications under Profile > Applications.Douwe Maan2015-07-025-4/+25
| | | |
| * | | Merge branch 'saml-troubleshooting' into 'master'Dmitriy Zaporozhets2015-07-021-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Troubleshooting section to SAML doc. In response to #1898. We'll properly fix it in another MR. See merge request !917
| | * | | Add Troubleshooting section to SAML doc.saml-troubleshootingDouwe Maan2015-07-011-0/+5
| | | | |
| * | | | Merge branch 'disable-deploy-edit-link' into 'master'Dmitriy Zaporozhets2015-07-022-2/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link leading to a 404 error in Deploy Keys page ### What does this MR do? This MR removes a link that would lead an admin to believe he/she could edit a deploy key, but clicking on this link would lead to a 404. ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b36cd76287d6389a09f9e0e49c1b6751/image.png) ### What are the relevant issue numbers? Closes #1866 See merge request !923
| | * | | Remove link leading to a 404 error in Deploy Keys pageStan Hu2015-07-012-2/+2
| | | |/ | | |/| | | | | | | | | Closes #1866
| * | | Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-022-22/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gem updates for security issues - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency) See merge request !915
| | * | | Gem updates for security issuesRobert Speicher2015-06-302-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency)
| * | | | Merge branch 'fix-changelog' into 'master'Stan Hu2015-07-021-2/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix changelog for !767 and !794 These changes did not make it into the 7.12.0 release. The entry for !794 is already correctly listed for 7.12.1 so it has been removed. See merge request !920
| | * | | Fix changelog for !767 and !794Daniel Gerhardt2015-07-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | These changes did not make it into the 7.12.0 release. The entry for !794 is already correctly listed for 7.12.1 so it has been removed.
| * | | | Merge branch 'gfm-commit' into 'master'Robert Speicher2015-07-011-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit hashes are monospaced Use a monospaced font for GFM commit and commit range references See merge request !914
| | * | | commit hashes are monospacedNicolás Reynolds2015-07-011-0/+4
| | | | |
* | | | | Merge branch 'creategroup' into 'master' Job van der Voort2015-07-025-4/+29
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | New document about creating a project Added new document to GitLab Basics about creating a project See merge request !1885
| * | | | fixed linkkaren Carias2015-07-011-2/+2
| | | | |
| * | | | new document about creating a projectkaren Carias2015-07-015-4/+29
|/ / / /
* | | | Mention faster merge operation inside one projectDmitriy Zaporozhets2015-07-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'improve-spinach-test-for-mr-submit' into 'master'Stan Hu2015-07-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an expect call to prevent random Spinach failure This should help prevent getting the error: ``` Unable to find field "merge_request_title ``` This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up. See merge request !882
| * | | | Add an expect call to prevent random Spinach failure:Stan Hu2015-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | "Unable to find field "merge_request_title"
* | | | | Merge branch 'refactor-can-be-merge' into 'master'Dmitriy Zaporozhets2015-07-013-7/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor can_be_merged logic for merge request Some refactoring after !918 cc @DouweM @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !919
| * | | | | Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-013-7/+24
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'use-rugged-for-merge' into 'master'Dmitriy Zaporozhets2015-07-013-6/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branches inside one repository using rugged instead of satellites Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @rspeicher @DouweM See merge request !918
| * | | | | Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-013-6/+56
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-multiple-ref-prefix' into 'master'Stan Hu2015-07-013-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the longest-matching ref from a commit path when multiple matches occur ### What does this MR do? This MR extracts the longest-matching ref from a commit path. In cases when there are multiple refs that prefix the path, the ref name is ambiguous. Using the heuristic that the longest-matching ref seems like a sensible default. ### Why was this MR needed? Suppose there is a branch named `release/app` and a tag named `release/app/v1.0.0`. Suppose `README.md` exists in the root directory. Let's suppose the path passed in is `release/app/v1.0.0/README.md`. There are two possible ways to interpret the ref and path: 1. ref = `release/app`, path = `v1.0.0/README.md` 2. ref = `release/app/v1.0.0`, path = `README.md` The crux of the issue is that there is ambiguity which one is correct; both could be real possibilities. In the current implementation of `extract_ref`, GitLab gets confused and tries neither: it uses ref = `release` and path = `app/v1.0.0/README.md`. Since the file does not exist, it returns 404. ### What are the relevant issue numbers? Closes #1839 See merge request !859
| * | | | | Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-013-4/+16
|/ / / / / | | | | | | | | | | | | | | | Closes #1839
* | | | | Update CHANGELOG for 7.12.1Jacob Vosmaer2015-07-011-0/+9
| | | | |
* | | | | Merge branch 'forking_on_gitlab_ci' into 'master'Valery Sizov2015-07-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab CI forking I created MR here because gitlab.com is unreachable. See merge request !1884
| * | | | fix of GitLab CI forkingValery Sizov2015-07-011-0/+1
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-012-3/+2
|\ \ \ \
| * \ \ \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-07-012-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX improvements * make atom feed on commits page smaller so it capture less attention * open big image 400px instead of default 40px when click on user avatar See merge request !910
| | * | | | Fix commits feed buttonDmitriy Zaporozhets2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Open big avatar when click on user imageDmitriy Zaporozhets2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Make commits atom feed button smallerDmitriy Zaporozhets2015-06-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-012-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets2015-07-012-2/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#blob_at should return nil for 00000000... sha Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !916
| | * | | | | Repository#blob_at should return nil for 00000000... shafix-zero-sha-lookupDmitriy Zaporozhets2015-07-012-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-0110-36/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277 ![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png) See merge request !1871
| * | | | | | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-2410-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2277.
* | | | | | | Mention performance improvements after adding cache to some fragmentsDmitriy Zaporozhets2015-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-017-7/+44
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-016-6/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reporter role can manage issue tracker now Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !908
| | * | | | | | | Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-306-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Merge branch 'k-devise' into 'master'Job van der Voort2015-07-011-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added note about Devise Added note about the authentication gem used in GitLab Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q See merge request !912
View Lorry Controller Status