summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '14564-mr-automatic-title' into 'master' Douwe Maan2016-05-061-6/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-set title for branches created from issues This sets the title for a new MR to 'Resolves "$issue-title"' when: - The source branch for the MR begins with a value iid. - The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line). - The iid does not point to a confidential issue. Single commit: ![A single commit uses the commit title](/uploads/cd34f59cd67f095c3034fae07950f8b5/image.png) Multiple commits: ![Multiple commits use the issue title](/uploads/a322c406ddd56913c5aebd88d16e5a5e/image.png) Confidential issue: ![A confidential issue uses the branch name](/uploads/7ae9b79de5f6101ced46802f3c3a6e71/image.png) cc @DouweM @zj Closes #14564 See merge request !3966
| * Don't auto-set MR title for confidential issuesSean McGivern2016-05-061-1/+1
| |
| * Auto-set title for branches created from issuesSean McGivern2016-05-061-6/+30
| | | | | | | | | | | | | | | | | | | | If a branch starts with an issue's IID, followed by a hyphen, the description will be updated to say that is closes the issue. This also updates the title of the merge request to 'Resolves "$issue-title"', as long as: - There is more than one commit in the merge request (if there is only one commit, the commit's title will be used as before) - The issue's IID is valid for the project
* | Merge branch 'remove-unexpected-filtering' into 'master' Grzegorz Bizon2016-05-061-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use outer join for issues ordering by milestones due. This MR contains an implementation for Solution 1 suggested in #14183 Ordering by Milestone due sooner/later ("milestone sort") filters issues without a milestone, which can let users feel like disappearing issues without a milestone. See merge request !3872
| * | Use outer join for issues ordering by milestones due.Takuya Noguchi2016-05-061-2/+3
| | |
* | | Merge branch 'annotate-models' into 'master' Douwe Maan2016-05-0672-323/+485
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Update annotations on models See merge request !3962
| * | Annotate the modelsZeger-Jan van de Weg2016-05-0672-323/+485
| | |
* | | Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into ↵Douwe Maan2016-05-061-2/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Assign labels milestone when moving issue Closes #14532. See merge request !3934
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-05107-748/+1092
| |\ \ | | |/ | | | | | | issue_14532_assign_labels_milestone_when_moving_issue
| * | Update changelog, improve specsLong Nguyen2016-05-051-1/+1
| | |
| * | Code refactor and fix broken specLong Nguyen2016-04-281-3/+5
| | |
| * | Allow to assign labels and milestone to target project when moving issueLong Nguyen2016-04-261-1/+10
| | |
* | | 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-048-36/+31
| | |
| * | Change build icons into buttons; update testsAnnabel Dunstone2016-05-044-11/+8
| | |
| * | Builds page redesignAnnabel Dunstone2016-05-0415-36/+75
| | |
| * | Start builds redesignAnnabel Dunstone2016-05-0455-85/+118
| | |
* | | Merge branch 'log-impersonation-events' into 'master' Stan Hu2016-05-052-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-042-0/+4
| | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#536
* | | | Merge branch 'fix-team-build-state-in-mr-widget' into 'master' Stan Hu2016-05-041-10/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-11/+8
| | | | |
| * | | | Merge request widget displays TeamCity build state and code coverage ↵Benedikt Huss2016-05-051-6/+6
| | | | | | | | | | | | | | | | | | | | 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-042-1/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Sanitize repo paths in new project error message Closes #17243 See merge request !4029
| * | | Sanitize repo paths in new project error messageStan Hu2016-05-042-1/+7
| | | | | | | | | | | | | | | | 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-042-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 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-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary Closes #17012
* | | | | | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'gravatar-fix' into 'master' Rémy Coutable2016-05-041-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-2/+2
| | | | | | |
* | | | | | | 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
| * | | | | Make files list more compact by reducing row height from 47px to 44pxcompact-files-listDmitriy Zaporozhets2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-043-40/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| * | | | | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tagRémy Coutable2016-05-043-43/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-042-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-043-5/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | | | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-293-5/+7
| | | | | | | | | | | | | | | | | | - Parameter validation as ISO8601 format
* | | | | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method call in events view Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD. See merge request !3996
| * | | | | | Remove unnecessary method call in events viewKarlo Soriano2016-05-011-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD.
* | | | | | Merge branch 'create-wikis-during-check' into 'master' Douwe Maan2016-05-041-11/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize wikis on legacy projects during check Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173 Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3931