summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix passing nil to protected_tag?tag-existsYorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this method would directly receive the output of tag_name(). This method could either return a String or nil. In the previous setup this would somehow magically work but because Rugged::TagCollection#[] doesn't accept nil values it started to fail. To work around this the elsif in change_access_check() assigns the result of tag_name() to a local and then _only_ calls protected_tag?() if the tag name is not nil. The extra parenthesis are put in place to ensure that things are parsed correctly, without these the code would be parsed as follows: elsif tag_ref = (tag_name(ref) && protected_tag(tag_ref)) During runtime this would basically resolve to: elsif tag_ref = (tag_name(ref) && protected_tag(nil)) This is because when you refer to the variable you're assigning _in_ the assignment Ruby returns nil instead of raising an error.
| * | | | | | | Use tag_exists? in GitAccess#protected_tag?Yorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for retrieving the entire list of tags just to check if a specific one exists.
| * | | | | | | Updated gitlab_git to 10.1.0Yorick Peterse2016-05-052-1/+3
|/ / / / / / /
* | | | | | | Merge branch 'fix-changelog-3880' into 'master' Yorick Peterse2016-05-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved entry for !3880 to 8.7.2 See merge request !4058
| * | | | | | | Moved entry for !3880 to 8.7.2Yorick Peterse2016-05-051-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this was already released in 8.7.2 but no changelog entry was added. [ci skip]
* | | | | | | Merge branch 'mr3931-changelog' into 'master' Yorick Peterse2016-05-051-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CHANGELOG entries for !3880 and !3931 See merge request !4057
| * | | | | | | Added CHANGELOG entry for merge request !3880Yorick Peterse2016-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Added CHANGELOG entry for merge request !3931Yorick Peterse2016-05-051-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'bump-sidekiq-4.1.2' into 'master' Robert Speicher2016-05-052-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.1.2 Fixes a memory leak: https://github.com/mperham/sidekiq/commit/a2bdb875fe495bc28b1bee80120e4a5641ca0731 See merge request !4056
| * | | | | | | Upgrade Sidekiq to 4.1.2Stan Hu2016-05-052-2/+3
|/ / / / / / /
* | | | | | | Merge branch 'gh-review-comments' into 'master' Douwe Maan2016-05-053-21/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the line code when importing PR review comments from GitHub Pull Request Review Comments are comments on a portion of the unified diff. Closes #17205 See merge request !4010
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-05-051-0/+1
| | | | | | | |
| * | | | | | | Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-052-21/+30
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull Request Review Comments are comments on a portion of the unified diff.
* | | | | | | Merge branch '15179-builds-redesign' into 'master' Jacob Schatz2016-05-0558-96/+160
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15179 builds page redesign Closes #15179 <img src="/uploads/d9ec515e500dc9023d588b5c38636a86/Screen_Shot_2016-04-26_at_1.35.11_PM.png" width="800px"> Updated screenshot: <img src="/uploads/63109057ee271d788ab726e52acf9328/Screen_Shot_2016-05-04_at_9.23.01_AM.png" width="800px"> Updated screenshot with count badges instead of parentheses: <img src="/uploads/d9cd91b079d23c63601c8dbcf4803c8d/Screen_Shot_2016-05-05_at_7.40.48_AM.png" width="800px"> See merge request !3935
| * | | | | | | Revert counter parentheses back to badges15179-builds-redesignAnnabel Dunstone2016-05-0412-50/+45
| | | | | | | |
| * | | | | | | Change build icons into buttons; update testsAnnabel Dunstone2016-05-048-25/+22
| | | | | | | |
| * | | | | | | Builds page redesignAnnabel Dunstone2016-05-0415-36/+75
| | | | | | | |
| * | | | | | | Start builds redesignAnnabel Dunstone2016-05-0455-85/+118
| | | | | | | |
* | | | | | | | Merge branch 'stanhu/gitlab-ce-bump-mailroom'Douwe Maan2016-05-053-3/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Bump mail_room to 0.7.0 to fix stuck IDLE connectionsStan Hu2016-04-303-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13357
* | | | | | | | Merge branch 'teamcity-changelog-fix' into 'master' Yorick Peterse2016-05-051-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Moved TeamCity changelog entry to 8.7.3 See merge request !4049
| * | | | | | | Moved TeamCity changelog entry to 8.7.3Yorick Peterse2016-05-051-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'log-impersonation-events' into 'master' Stan Hu2016-05-053-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log to application.log when an admin starts and stops impersonating a user Closes gitlab-org/gitlab-ee#536 See merge request !4028
| * | | | | | | Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-043-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#536
* | | | | | | | Merge branch 'new-badge-url' into 'master' Rémy Coutable2016-05-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new build badge URLs Use new build badge URLs to follow the instruction at [the project badges](https://gitlab.com/gitlab-org/gitlab-ce/badges). See merge request !4037
| * | | | | | | | Use new build badge URLsTakuya Noguchi2016-05-041-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-team-build-state-in-mr-widget' into 'master' Stan Hu2016-05-043-10/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request widget displays TeamCity build state and code coverage correctly again ## What does this MR do? This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer. ## Are there points in the code the reviewer needs to double check? The changes are quite simple, so please simply double check them. ## Why was this MR needed? This MR is needed to make the TeamCity build status working again. ## What are the relevant issue numbers? #17080 See merge request !3998
| * | | | | | | | | Feedback from stanhuBenedikt Huss2016-05-053-14/+26
| | | | | | | | | |
| * | | | | | | | | Merge request widget displays TeamCity build state and code coverage ↵Benedikt Huss2016-05-052-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly again
* | | | | | | | | | Merge branch 'rs-repository-size-format' into 'master' Stan Hu2016-05-041-6/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `number_to_human_size` helper to show repository size This will intelligently format large repository sizes in GBs (or, shudder, TBs). Also, removes `rescue` clause from `repository_size` helper. The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary. See merge request !4047
| * | | | | | | | | Remove `rescue` clause from `repository_size` helperrs-repository-size-formatRobert Speicher2016-05-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary.
| * | | | | | | | | Use `number_to_human_size` helper to show repository sizeRobert Speicher2016-05-041-1/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will intelligently format large repository sizes in GBs (or, shudder, TBs).
* | | | | | | | | Merge branch 'sanitize-new-project-error-message' into 'master' Robert Speicher2016-05-044-1/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize repo paths in new project error message Closes #17243 See merge request !4029
| * | | | | | | | Sanitize repo paths in new project error messageStan Hu2016-05-044-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17243
* | | | | | | | | Merge branch '17000-comment-links' into 'master' Jacob Schatz2016-05-041-4/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove break-all from links Closes #17000 See merge request !4042
| * | | | | | | | | Remove break-all from links17000-comment-linksAnnabel Dunstone2016-05-041-4/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-files-page-colors' into 'master' Jacob Schatz2016-05-042-4/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file list page border colors See merge request !4008
| * | | | | | | | | Fix table bordersfix-files-page-colorsDmitriy Zaporozhets2016-05-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Use correct border color between table rowsDmitriy Zaporozhets2016-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'improve-milestone-ui' into 'master' Jacob Schatz2016-05-043-8/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve milestone page UI * remove button after edit button * use hex value for text color * re-use existing text color variables Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4014
| * | | | | | | | | | Improve milestone page UIimprove-milestone-uiDmitriy Zaporozhets2016-05-033-8/+8
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'invalid-exists-on-new-push' into 'master' Yorick Peterse2016-05-043-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire repository exists? and has_visible_content? caches after a push if necessary See merge request !3975
| * | | | | | | | | Expire repository exists? and has_visible_content? caches after a push if ↵Stan Hu2016-05-043-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary Closes #17012
* | | | | | | | | | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-042-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
| * | | | | | | | | | Remove unused .contributed-projects classKarlo Soriano2016-04-272-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
* | | | | | | | | | Merge branch 'limit-mr-seedfu' into 'master' Robert Speicher2016-05-041-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the number of merge requests per project to avoid long seeds in development environment This step was taking a long time because seed_fu creates N / 2 merge requests for each repo, where N is the number of branches for that repo. At the time of this writing, there are 234 branches on the gitlab-ce repo, leading to 117 merge requests. See merge request !4032
| * | | | | | | | | Limit the number of merge requests per project to avoid long seedsStan Hu2016-05-041-1/+4
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This step was taking a long time because seed_fu creates N / 2 merge requests for each repo, where N is the number of branches for that repo. At the time of this writing, there are 234 branches on the gitlab-ce repo, leading to 117 merge requests.
* | | | | | | | | Merge branch 'gravatar-fix' into 'master' Rémy Coutable2016-05-043-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new admin settings for gravatar Fixes gitlab-org/gitlab-ce#14826 See merge request !3988
| * | | | | | | | | Use the new admin settings for gravatarArtem Sidorenko2016-05-043-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'compact-files-list' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make files list more compact by reducing row height from 47px to 44px Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !4007