summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-18/+24
|\
| * Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-18/+24
* | use full caps RSS instead of rssAlexis Reigel2017-05-241-3/+3
* | atom links with rss token instead of private tokenAlexis Reigel2017-05-241-0/+36
|/
* Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\
| * Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-24/+18
| * Fix specsDouwe Maan2017-05-232-19/+25
* | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-231-4/+3
|\ \
| * | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-4/+3
* | | Merge branch 'add-unicode-trace-feature-test' into 'master'Kamil Trzciński2017-05-231-42/+15
|\ \ \
| * | | Add feature test with unicode traceadd-unicode-trace-feature-testShinya Maeda2017-05-231-42/+15
* | | | Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-7/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Improve test wordingZ.J. van de Weg2017-05-231-7/+7
| * | | Make sorting difference clearerZeger-Jan van de Weg2017-05-191-4/+4
| * | | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+5
* | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-231-0/+44
|\ \ \ \ | |_|_|/ |/| | |
| * | | minor adjustments to the specsJose Ivan Vargas2017-05-221-10/+9
| * | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-221-1/+1
| * | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-221-0/+45
* | | | 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
View Lorry Controller Status