summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow filtering by all started milestonesbetter-priority-sortingSean McGivern2017-03-1515-12/+107
|
* Allow sorting by due date and label prioritySean McGivern2017-03-1510-15/+106
|
* Merge branch 'docs/nested-groups' into 'master' Achilleas Pipinellis2017-03-157-0/+166
|\ | | | | | | | | | | | | Add nested groups documentation Closes #28761 See merge request !9783
| * Change naming from nested groups to subgroupsdocs/nested-groupsAchilleas Pipinellis2017-03-151-1/+1
| | | | | | | | [ci skip]
| * Address subgroups docs reviewAchilleas Pipinellis2017-03-141-47/+39
| | | | | | | | [ci skip]
| * Fix wordingAchilleas Pipinellis2017-03-141-2/+2
| | | | | | | | [ci skip]
| * Add info on group membershipAchilleas Pipinellis2017-03-141-10/+29
| | | | | | | | [ci skip]
| * Add nested groups documentationAchilleas Pipinellis2017-03-147-0/+155
| | | | | | | | [ci skip]
* | Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master' Achilleas Pipinellis2017-03-152-0/+15
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Document U2F limitations with multiple URLs" Closes #28277 See merge request !9300
| * | Document U2F limitations with multiple hostnames/FQDNs.28277-document-u2f-limitations-with-multiple-urlsTimothy Andrew2017-02-252-0/+15
| | |
* | | Merge branch 'issue-boards-docs' into 'master' Achilleas Pipinellis2017-03-151-2/+9
|\ \ \ | | | | | | | | | | | | | | | | Added issue boards re-ordering docs See merge request !9924
| * | | Added issue boards re-ordering docsPhil Hughes2017-03-151-2/+9
| | | |
* | | | Merge branch 'fix-milestone-name-on-show' into 'master' Rémy Coutable2017-03-153-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on Milestones show page. Fixes #29214 Closes #29214 See merge request !9913
| * | | | Switch to using milestone.to_reference when displaying milestone Fix #29214Raveesh2017-03-143-2/+6
| | | | |
* | | | | Merge branch 'fix-polling-doc' into 'master' Sean McGivern2017-03-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match` See merge request !9957
| * | | | | Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match`fix-polling-docRémy Coutable2017-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' Sean McGivern2017-03-152-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-test repo Closes #27551 See merge request !9945
| * | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵27551-use-dev-mirror-of-gitlab-git-test-on-devRémy Coutable2017-03-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'rs-dropdown-author-spec-speed' into 'master' Rémy Coutable2017-03-151-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up the issues/filtered_search/dropdown_author feature spec See merge request !9951
| * | | | | | | Speed up the issues/filtered_search/dropdown_author feature specrs-dropdown-author-spec-speedRobert Speicher2017-03-141-2/+3
| | | | | | | |
* | | | | | | | Merge branch 'test-db-rollback' into 'master' Kamil Trzciński2017-03-1511-9/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test which would rollback db and migrate again Closes #29106 See merge request !9908
| * | | | | | | | Split to two commands, feedback:test-db-rollbackLin Jen-Shin2017-03-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25331127
| * | | | | | | | Use `remove_foreign_key :timelogs, name: '...'`Lin Jen-Shin2017-03-141-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9908#note_25324225
| * | | | | | | | Drop the index only for postgresql, becauseLin Jen-Shin2017-03-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql cannot simply drop the index without dropping the corresponding foreign key, and we certainly don't want to drop the foreign key here.
| * | | | | | | | Disable rubocop for down methodLin Jen-Shin2017-03-141-0/+1
| | | | | | | | |
| * | | | | | | | Fix for postgresqlLin Jen-Shin2017-03-144-4/+12
| | | | | | | | |
| * | | | | | | | Add a test which would rollback db and migrate againLin Jen-Shin2017-03-149-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29106
* | | | | | | | | Merge branch ↵Rémy Coutable2017-03-153-3/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29469-message-for-project-x-will-be-deleted-should-include-namespace' into 'master' Display full project name with namespace upon deletion Closes #29469 See merge request !9955
| * | | | | | | | Display full project name with namespace upon deletionMark Fletcher2017-03-153-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes ambiguity when two projects exist with the same name
* | | | | | | | | Merge branch 'fix-migration-rc1-rollback' into 'master' Stan Hu2017-03-152-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixing two migrations that could not be rolled back See merge request !9953
| * | | | | | | | Fixing two migrations that could not be rolled backfix-migration-rc1-rollbackDJ Mountney2017-03-142-2/+6
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | when rolling back from 9-0-stable to 8.17.3
* | | | | | | | Merge branch '29414-fix-toggle-disccusion-link-jump-pick-into-9-0' into ↵Alfredo Sumaran2017-03-151-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix link togglers jumping to top Closes #29414 See merge request !9943
| * | | | | | | | Fix link togglers jumping to top29414-fix-toggle-disccusion-link-jump-pick-into-9-0Eric Eastwood2017-03-141-1/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix #29414
* | | | | | | | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' Alfredo Sumaran2017-03-157-6/+122
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle long Project names Closes #28187 See merge request !9501
| * | | | | | | Toggle project name if too long28187-project-name-cut-off-with-nested-groupsSam Rose2017-03-137-6/+122
| | | | | | | |
* | | | | | | | Merge branch 'preserve_order_issue_board' into 'master' Douwe Maan2017-03-144-1/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve order by priority on issues board See merge request !9939
| * | | | | | | | Preserve order by priority on issues boardpreserve_order_issue_boardValery Sizov2017-03-144-1/+49
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-expand-on-definition-of-done' into 'master' Stan Hu2017-03-142-0/+49
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add performance/scalability concerns to CONTRIBUTING.md See merge request !8677
| * | | | | | | | | Describe polling with ETag cachingsh-expand-on-definition-of-doneAdam Niedzielski2017-03-142-2/+44
| | | | | | | | | |
| * | | | | | | | | Add performance/scalability concerns to CONTRIBUTING.mdStan Hu2017-03-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' Robert Speicher2017-03-143-5/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix first line markdown helper for user profile activity stream Closes #29425 See merge request !9920
| * | | | | | | | | | Fix first line markdown helper for user profile activity stream29425-fix-activity-stream-first-line-markdownEric Eastwood2017-03-143-5/+21
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29425
* | | | | | | | | | Merge branch 'fix-intermittent-notify-spec' into 'master' Rémy Coutable2017-03-141-111/+120
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix intermittent spec failures in notify_spec.rb See merge request !9935
| * | | | | | | | | | Fix intermittent spec failures in notify_spec.rbNick Thomas2017-03-141-111/+120
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '29441-cancel-button-misaligned-in-new-application-page' into ↵Filipa Lacerda2017-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Cancel button misaligned in New Application page" Closes #29441 See merge request !9933
| * | | | | | | | | | | Change Canccel button class29441-cancel-button-misaligned-in-new-application-pageChris Peressini2017-03-141-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to be `btn-default`, change it to `btn-cancel`
* | | | | | | | | | | Merge branch 'remove-satellites' into 'master' Douwe Maan2017-03-141-10/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused satellites config See merge request !9919
| * | | | | | | | | | Remove unused satellites configStan Hu2017-03-131-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely.
* | | | | | | | | | | Merge branch 'syshook_documentation_updated' into 'master' Achilleas Pipinellis2017-03-141-2/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syshook documentation updated See merge request !9893
| * | | | | | | | | | | Syshook documentation updatedgpongelli2017-03-141-2/+13
|/ / / / / / / / / / /