summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix go-get support for projects in nested groupsdm-nested-groups-go-getDouwe Maan2017-03-072-18/+143
|
* Merge branch '18962-update-issues-button-jumps' into 'master' Alfredo Sumaran2017-03-074-5/+36
|\ | | | | | | | | | | | | Align bulk update issues button to the right Closes #18962 See merge request !8591
| * Align bulk update issues button to the rightRémy Coutable2017-03-074-5/+36
|/
* Update CHANGELOG.md for 8.17.3Regis2017-03-077-24/+9
| | | [ci skip]
* Merge branch '28230-new-mr-spacing' into 'master' Annabel Dunstone Gray2017-03-0711-92/+66
|\ | | | | | | | | | | | | consistent padding on new MR panels Closes #28230 See merge request !9568
| * consistent spacing on new MR panels28230-new-mr-spacingSimon Knox2017-03-0711-92/+66
| | | | | | | | | | | | center spinner show placeholder text on new MR page remove redundant `display: block` from li - they default to `list-style` already
* | Merge branch 'dm-add-concurrent-index-cop' into 'master' Yorick Peterse2017-03-0722-22/+192
|\ \ | | | | | | | | | | | | Add cop to ensure reversibility of add_concurrent_index See merge request !9771
| * | Add downtime constantsdm-add-concurrent-index-copDouwe Maan2017-03-073-0/+6
| | |
| * | Add cop to ensure reversibility of add_concurrent_indexDouwe Maan2017-03-0722-22/+186
| | |
* | | Merge branch '27568-refactor-very-slow-dropdown-asignee-spec' into 'master' Rémy Coutable2017-03-072-33/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor dropdown_assignee_spec Closes #27568 See merge request !9711
| * | | Refactor dropdown_assignee_specGeorge Andrinopoulos2017-03-072-33/+45
|/ / /
* | | Merge branch 'fix-specs-for-access-tokens' into 'master' Douwe Maan2017-03-072-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix access token specs See merge request !9776
| * | | Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-072-3/+3
| | | | | | | | | | | | | | | | | | | | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 was a manual merge, which meant it didn't have a build, so I broke master :-(
* | | | Merge branch 'zj-variables-build-job' into 'master' Kamil Trzciński2017-03-075-50/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BUILD to JOB in CI Variables Closes #29053 See merge request !9756
| * | | | Rename REF to SHAZ.J. van de Weg2017-03-073-4/+4
| | | | |
| * | | | Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-075-50/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
* | | | | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' Robert Speicher2017-03-071-9/+28
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Swallow collection errors in RspecProfiling Closes #29005 See merge request !9765
| * | | | Swallow collection errors in RspecProfilingNick Thomas2017-03-071-9/+28
| | |/ / | |/| |
* | | | Merge branch 'zj-chat-teams-unique' into 'master' Kamil Trzciński2017-03-073-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Namespace can have only one chat team See merge request !9769
| * | | | Namespace can have only one chat teamzj-chat-teams-uniqueZ.J. van de Weg2017-03-073-0/+15
| | |/ / | |/| |
* | | | Merge branch 'priority-to-label-priority' into 'master' Sean McGivern2017-03-074-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename priority sorting option to label priority See merge request !9746
| * | | | Rename priority sorting option to label priorityDimitrie Hoekstra2017-03-074-7/+11
|/ / / /
* | | | Merge branch ↵Sean McGivern2017-03-0727-114/+328
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages' into 'master' Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages" Closes #26732 See merge request !8731
| * \ \ \ Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-072089-22418/+16234
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
| * | | | | Added test case for the avaiable project keysJose Ivan Vargas2017-03-061-4/+11
| | | | | |
| * | | | | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed naming of a test in the deploy_keys_presenter
| * | | | | Removed repository_helper.rbJose Ivan Vargas2017-03-061-22/+0
| | | | | |
| * | | | | Fixed repository_controller_specJose Ivan Vargas2017-03-062-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | also added an #open_branches private method
| * | | | | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-066-47/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed the deploy_keys view and moved the code from the repository_helper to the repository_controller
| * | | | | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-0612-33/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added specs for the deploy_keys_presenter and added a new method in the presenter called #key_available? Fixed some minor UX inconsistencies and added a concern to handle redirection
| * | | | | Added access spec testsJose Ivan Vargas2017-03-068-24/+45
| | | | | | | | | | | | | | | | | | | | | | | | Also created changelog and removed redundant code
| * | | | | Add access spec tests for the /settings/repository routeJose Ivan Vargas2017-03-061-0/+14
| | | | | |
| * | | | | Introduced the deploy keys presenterGrzegorz Bizon2017-03-067-32/+110
| | | | | |
| * | | | | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-068-38/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modified the render calls to the deploy_keys and protected_branches partials
| * | | | | Created the gear settings entry and created a way to initialize both ↵Jose Ivan Vargas2017-03-0610-27/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sections with one controller Changed views to partials, created the repository view, created a repository_helper to further aid the creation of variables across different controllers
| * | | | | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-063-0/+12
| | | | | |
* | | | | | Merge branch '27936-avatar-has-wrong-cache-settings' into 'master' Douwe Maan2017-03-073-0/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure uploads are not cached without revalidation Closes #27936 See merge request !9453
| * | | | | | Ensure mutable uploads are not cached without revalidationPawel Chojnacki2017-02-223-0/+88
| | | | | | |
* | | | | | | Merge branch 'prometheus-monitoring' into 'master' Rémy Coutable2017-03-0730-28/+2301
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Prometheus Service and Prometheus graphs See merge request !8935
| * | | | | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-0730-28/+2301
|/ / / / / / /
* | | | | | | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-0728-65/+178
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597
| * | | | | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-0328-65/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* | | | | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' James Lopez2017-03-073-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change project count limit from 10 to 100000 See merge request !9767
| * | | | | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limitRegis Freyd2017-03-073-4/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/deprecate-ci-config-types' into 'master' Kamil Trzciński2017-03-072-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate usage of `types` CI/CD configuration entry See merge request !9766
| * | | | | | | | | Add Changelog entry for CI/CD types deprecationfix/gb/deprecate-ci-config-typesGrzegorz Bizon2017-03-071-0/+4
| | | | | | | | | |
| * | | | | | | | | Deprecate usage of `types` CI/CD configuration entryGrzegorz Bizon2017-03-071-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-0736-131/+731
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Add specs for Doorkeeper resource_owner_authenticatorMarkus Koller2017-03-072-6/+65
| | | | | | | | | |
| * | | | | | | | | Remove whitespace in GemfileMarkus Koller2017-03-071-51/+51
| | | | | | | | | |
View Lorry Controller Status