summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-24/+18
* Fix specsDouwe Maan2017-05-232-19/+25
* Merge branch 'handle-transient-mr-query-count-spec' into 'master'Douwe Maan2017-05-221-1/+1
|\
| * Handle transient MR query count spechandle-transient-mr-query-count-specOswaldo Ferreira2017-05-191-1/+1
* | Merge branch 'zj-pipeline-json-performance' into 'master'Kamil Trzciński2017-05-211-5/+33
|\ \ | |/ |/|
| * Improve pipeline size for query limit testzj-pipeline-json-performanceZ.J. van de Weg2017-05-171-5/+33
* | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-191-0/+26
|\ \
| * | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-191-0/+26
* | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-191-0/+12
|\ \ \
| * | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| * | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-0/+9
* | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-195-307/+607
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-193-8/+238
| * | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-183-312/+369
| * | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13
| |/ /
* | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-191-0/+40
|/ /
* | CodestyleGabriel Mazetto2017-05-131-1/+1
* | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+28
* | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-2/+8
|\ \
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-2/+8
* | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-121-21/+50
|\ \ \ | |_|/ |/| |
| * | Respond with 404 when metrics are not enabled or deployment_metrics is not im...Pawel Chojnacki2017-05-121-21/+50
| |/
* | Fix redirect message for groups and usersMichael Kozono2017-05-113-8/+20
|/
* 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
|\ \ \ \ \ | | |/ / / | |/| | |