summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-086-7/+6
|
* Merge branch 'reduce-delete-delay' into 'master' Stan Hu2016-05-073-3/+9
|\ | | | | | | | | | | | | | | Reduce delay in destroying a project from 1-minute to immediately This 1-minute delay was causing confusion among customers. Was there a reason this needed to be 1 minute? See merge request !3997
| * Reduce delay in destroying a project from 1-minute to immediatelyStan Hu2016-05-073-3/+9
|/ | | | Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
* Merge branch 'dz-improve-group-settings' into 'master' Dmitriy Zaporozhets2016-05-061-1/+1
|\ | | | | | | | | | | | | | | | | Make group settings button white instead of gray for better visibility Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @annabeldunstone @skyruler See merge request !4078
| * Make group settings button white instead of gray for better visibilitydz-improve-group-settingsDmitriy Zaporozhets2016-05-061-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'nice-todos-bell' into 'master' Dmitriy Zaporozhets2016-05-063-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | Add nice new Todo bell ![H5bp___Html5_Boilerplate___GitLab](/uploads/e8725396a5d77a8db09742f977595605/H5bp___Html5_Boilerplate___GitLab.png) ![H5bp___Html5_Boilerplate___GitLab](/uploads/011a21ee1653502c4f78543e28d97b67/H5bp___Html5_Boilerplate___GitLab.png) ![H5bp___Html5_Boilerplate___GitLab](/uploads/0858cb9621463ef6a32237fcb0b4f63d/H5bp___Html5_Boilerplate___GitLab.png) Fixes: #15671 See merge request !4077
| * Add nice new Todo bellnice-todos-bellJacob Schatz2016-05-063-1/+10
| |
* | Merge branch 'dz-refactor-group-subnav' into 'master' Dmitriy Zaporozhets2016-05-062-40/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move group settings navigation to own partial A bit of refactoring for !3980 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4076
| * | Move group settings navigation to own partialdz-refactor-group-subnavDmitriy Zaporozhets2016-05-062-40/+21
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch '17343-a-tag-code' into 'master' Jacob Schatz2016-05-061-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Align code within links in comments Closes #17343 <img src="/uploads/78e03c1dc0e99c7bdb686d9d120a4525/Screen_Shot_2016-05-06_at_9.28.26_AM.png" width="800px"> See merge request !4073
| * | Align code within links in comments17343-a-tag-codeAnnabel Dunstone2016-05-061-0/+5
| | |
* | | Merge branch 'annotate-models' into 'master' Robert Speicher2016-05-065-2/+6
|\ \ \ | | | | | | | | | | | | | | | | Annotate models See merge request !4071
| * | | Annotate modelsDmitriy Zaporozhets2016-05-065-2/+6
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'update-db-schema' into 'master' Robert Speicher2016-05-061-9/+9
|\ \ \ | |/ / |/| | | | | | | | Update db/schema.rb after running db:migrate:reset See merge request !4074
| * | Update db/schema.rb after running db:migrate:resetDmitriy Zaporozhets2016-05-061-9/+9
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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
| | | | | | |