summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-101-1/+1
|\
| * Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-101-1/+1
* | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-101-0/+35
* | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-0/+28
* | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-3/+3
|/
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-2/+6
|\
| * Fix specs 2Felipe Artur2017-05-081-1/+4
| * Fix SpecsFelipe Artur2017-05-081-1/+2
* | Merge request widget redesignFatih Acet2017-05-094-158/+270
|/
* Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-071-0/+87
* Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-061-1/+1
|\
| * Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-059-12/+521
| |\
| * | Improve code style related to protected actionsGrzegorz Bizon2017-05-031-3/+1
| * | Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-035-97/+370
| |\ \
| * | | Fix builds controller spec related to protected actionsGrzegorz Bizon2017-05-021-0/+2
* | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-061-0/+31
* | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-23/+376
|\ \ \ \
| * | | | Resolve discussionsMichael Kozono2017-05-053-0/+7
| * | | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-051-4/+4
| * | | | Add “project moved” flash message on redirectMichael Kozono2017-05-053-0/+8
| * | | | Resolve discussionsMichael Kozono2017-05-051-0/+18
| * | | | Fix Rubocop failuresMichael Kozono2017-05-051-4/+4
| * | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-054-21/+341
* | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-051-0/+32
|\ \ \ \ \
| * | | | | refactor code based on feedbackJames Lopez2017-05-051-4/+4
| * | | | | refactor a few things based on feedbackJames Lopez2017-05-041-0/+32
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-056-11/+481
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
| | |_|/ | |/| |
| * | | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-0/+66
| |\ \ \
| | * \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-045-12/+252
| | |\ \ \
| | * \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0312-164/+491
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-281-12/+354
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load...Jacob Schatz2017-04-271-0/+66
| | |\ \ \ \ \ \
| | | * | | | | | Project deploy keys json end pointJarka Kadlecova2017-03-241-0/+66
| * | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+188
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+188
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+87
| |\ \ \ \ \ \ \
| | * | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+87
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-042-11/+104
| |\ \ \ \ \ \ \
| | * | | | | | | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-042-11/+104
| | |/ / / / / /
* | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-044-7/+7
|/ / / / / / /
* | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-042-1/+61
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-0/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed failing specsPhil Hughes2017-04-261-2/+0
| * | | | | Added controller specsPhil Hughes2017-04-262-0/+17
* | | | | | Merge branch 'rs-described_class-cop-2' into 'master' Douwe Maan2017-05-021-4/+4
|\ \ \ \ \ \
| * | | | | | Auto-correct `RSpec/DescribedClass` violationsrs-described_class-cop-2Robert Speicher2017-05-011-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+42
|\ \ \ \ \ \
| * | | | | | Cleanup deploymentsd controller spec and use schema validation to test the ou...Pawel Chojnacki2017-04-241-9/+4
| * | | | | | Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2024-78/+959
| |\ \ \ \ \ \