summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-031-0/+11
|\
| * Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-041-0/+11
* | Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-26/+50
* | Fix spec for Projects::Boards::ListsControllerDouglas Barbosa Alexandre2017-02-031-1/+1
|/
* Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+2
|\
| * Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-025-17/+128
| |\
| * \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2643-74/+67
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2616-47/+358
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0416-238/+585
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-102-2/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-082-1/+63
| |\ \ \ \ \ \
| * | | | | | | Fix tests to use the new APILin Jen-Shin2016-12-081-1/+2
* | | | | | | | Use `add_$role` helper in snippets specssnippet-spamSean McGivern2017-02-021-4/+4
* | | | | | | | Check public snippets for spamSean McGivern2017-02-022-0/+139
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Abillity to promote project labels to group labelsRitave2017-01-311-0/+45
* | | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
* | | | | | | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-312-15/+54
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use ApiHelpers in merge request specs for API routesfeature/gb/expose-commit-and-mr-pipelines-apiGrzegorz Bizon2017-01-301-11/+5
| * | | | | | | | Add controller tests for commit pipelines endpointGrzegorz Bizon2017-01-271-5/+19
| * | | | | | | | Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+32
* | | | | | | | | Fix a transient failure in the `Explore::ProjectsController` specrs-issue-27350Robert Speicher2017-01-271-14/+11
|/ / / / / / / /
* | | | | | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-261-0/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix /explore sorting (trending)Eric Eastwood2017-01-261-0/+30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
|/ / / / / /
* | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-0/+6
* | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-221-0/+1
* | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma...Grzegorz Bizon2017-01-211-6/+0
|/ / / / /
* | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-201-0/+6
|\ \ \ \ \
| * | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-151-0/+6
* | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-0/+20
|\ \ \ \ \ \
| * | | | | | Corrected code style and titlesJose Ivan Vargas2017-01-181-2/+2
| * | | | | | Fixed more testsJose Ivan Vargas2017-01-181-1/+1
| * | | | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-181-0/+20
* | | | | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-191-3/+35
|\ \ \ \ \ \ \
| * | | | | | | Add sorting pipeline for a commitTakuya Noguchi2017-01-191-3/+35
* | | | | | | | Merge branch 'zj-fix-admin-templates' into 'master' Kamil Trzciński2017-01-191-0/+26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add tests for admin service templateszj-fix-admin-templatesZ.J. van de Weg2017-01-061-0/+26
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-16/+32
|\ \ \ \ \ \ \
| * | | | | | | Backport backend work for time tracking.Ruben Davila2017-01-151-16/+32
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-181-0/+30
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-161-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Added specs for the preservation of the from/to parameter Martin Cabrera2017-01-151-1/+21
| * | | | | | | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-151-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Added specs for branches compare when from & to are emptyMartin Cabrera2017-01-101-0/+10
* | | | | | | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-172-0/+116
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Address MR commentsJarka Kadlecova2017-01-131-3/+19
View Lorry Controller Status