summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add nice new Todo bellnice-todos-bellJacob Schatz2016-05-063-1/+10
|
* Merge branch 'group-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-0626-75/+185
|\ | | | | | | | | | | | | Redesign navigation for group pages Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request See merge request !3980
| * Remove duplicate cover-control mobile stylesgroup-navigation-redesignAnnabel Dunstone2016-05-051-12/+0
| |
| * Fix group settings dropdown for group members and visitorsDmitriy Zaporozhets2016-05-051-15/+15
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove group rss icon since it depends on context and duplciates on other pagesDmitriy Zaporozhets2016-05-051-3/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove mobile styles; horizontally scroll layout nav linksAnnabel Dunstone2016-05-051-19/+3
| |
| * Merge branch 'master' into group-navigation-redesignDmitriy Zaporozhets2016-05-0564-227/+752
| |\
| * | Reduce height of nav to 50pxAnnabel Dunstone2016-05-043-5/+6
| | |
| * | Update font colors, font sizes, caret icon, avatar sizeAnnabel Dunstone2016-05-046-5/+42
| | |
| * | Fixed layout nav, revert back to badge styles, general enhancementsAnnabel Dunstone2016-05-045-16/+38
| | |
| * | Redesign profile page and group page mobile navigationAnnabel Dunstone2016-05-036-12/+88
| | |
| * | Group navigation design updateAnnabel Dunstone2016-05-037-23/+39
| | |
| * | Fix 404 on group page if user is not member of pageDmitriy Zaporozhets2016-05-031-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove go to dashboard test suite for group page and get rid of AR warningDmitriy Zaporozhets2016-05-034-11/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix active state for group pages if user not logged inDmitriy Zaporozhets2016-05-031-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Dont specify sidebar for group and group settings layoutsDmitriy Zaporozhets2016-05-032-2/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into group-navigation-redesignDmitriy Zaporozhets2016-05-03156-1079/+2554
| |\ \
| * | | Redesign navigation for group pagesDmitriy Zaporozhets2016-04-2812-34/+31
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch '14564-mr-automatic-title' into 'master' Douwe Maan2016-05-062-6/+211
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-2/+11
| | | | |
| * | | | Auto-set title for branches created from issuesSean McGivern2016-05-062-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add specs for MergeRequests::BuildServiceSean McGivern2016-05-061-0/+146
| | | | |
* | | | | Merge branch 'remove-unexpected-filtering' into 'master' Grzegorz Bizon2016-05-063-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Update CHANGELOGTakuya Noguchi2016-05-061-0/+1
| | | | | |
| * | | | | Use outer join for issues ordering by milestones due.Takuya Noguchi2016-05-062-2/+5
| | | | | |
* | | | | | Merge branch 'annotate-models' into 'master' Douwe Maan2016-05-0673-323/+529
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update annotations on models See merge request !3962
| * | | | | Auto annotate models on migrationannotate-modelsZeger-Jan van de Weg2016-05-061-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | 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-063-8/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-05227-1341/+3520
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | issue_14532_assign_labels_milestone_when_moving_issue
| * | | | | | Update changelog, improve specsLong Nguyen2016-05-053-5/+9
| | | | | | |
| * | | | | | Update changelogLong Nguyen2016-04-281-1/+1
| | | | | | |
| * | | | | | Add changelogLong Nguyen2016-04-281-0/+1
| | | | | | |
| * | | | | | Fix rubocopLong Nguyen2016-04-281-2/+1
| | | | | | |
| * | | | | | Code refactor and fix broken specLong Nguyen2016-04-282-8/+18
| | | | | | |
| * | | | | | Update specsLong Nguyen2016-04-271-9/+4
| | | | | | |
| * | | | | | Allow to assign labels and milestone to target project when moving issueLong Nguyen2016-04-262-1/+30
| | | | | | |
* | | | | | | Merge branch 'available-memory-req' into 'master' Achilleas Pipinellis2016-05-061-1/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note to requirements doc on swap recommendation, and ensuring enough available memory. Called out as a result of 2GB RAM DO droplets not being enough to run backups on without adding a swap file. See: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1267 cc\ @stanhu @axil See merge request !4060
| * | | | | | Add note to requirements doc on swap recommendation, and ensuring enough ↵available-memory-reqDJ Mountney2016-05-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | available memory.
* | | | | | | Merge branch 'patch-4' into 'master' Stan Hu2016-05-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify changelog entry on GitHub Enterprise import support /cc @stanhu See merge request !4066
| * | | | | | | clarify changelog entry on GitHub Enterprise import supportBen Bodenmiller2016-05-061-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-061-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rake drop tables with cascade See merge request !4020
| * | | | | | | Rake drop tables with cascadeDrew Blessing2016-05-031-1/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/import-url-issues' into 'master' Robert Speicher2016-05-052-7/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importer bug when throwing exceptions Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681 See merge request !3941
| * | | | | | | fix failing specfix/import-url-issuesJames Lopez2016-04-281-5/+4
| | | | | | | |
| * | | | | | | added spec testing exception raisedJames Lopez2016-04-281-6/+21
| | | | | | | |
| * | | | | | | fix var errorJames Lopez2016-04-271-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'rs-each-arg' into 'master' Robert Speicher2016-05-051-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to testing docs about the `:each` argument to RSpec hooks [ci skip] See merge request !4061
| * | | | | | | Add a note to testing docs about the `:each` argument to RSpec hooksRobert Speicher2016-05-051-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'tag-exists' into 'master' Robert Speicher2016-05-053-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tag_exists? in GitAccess#protected_tag? This will fail until https://gitlab.com/gitlab-org/gitlab_git/merge_requests/81/ is merged. Adding this should speed up checking for tags in `Gitlab::GitAccess` as it no longer needs to retrieve the entire list of tags. See https://gitlab.com/gitlab-org/gitlab-ce/issues/14280 for more information. See merge request !3983
View Lorry Controller Status