summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-019-60/+87
|\
| * Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-313-33/+33
| |\
| | * Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-1/+5
| | |\
| | * \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-313-7/+24
| | |\ \
| | * | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-2/+2
| | * | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2614-375/+844
| | |\ \ \
| | * | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-32/+32
| * | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-305-25/+48
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | fixed move issue specsPhil Hughes2017-05-251-1/+1
| * | | | | Fix builds controller specs related to protected actionsGrzegorz Bizon2017-05-311-1/+5
| | |/ / / | |/| | |
| * | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-293-7/+10
| |\ \ \ \
| | * | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-1/+1
| | * | | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-172-6/+9
| | | |/ / | | |/| |
| * | | | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-0/+14
| | |_|/ | |/| |
| * | | 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
* | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-256-51/+108
|\ \ \ \ | |/ / /
| * | | 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
* | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-4/+9
|/ / / /
* | | | 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
|/ /
View Lorry Controller Status