summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+52
| * | | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+48
| |/ / / /
* | | | | Fix to display notice when project settings updated.sandish chen2017-01-151-1/+1
| |/ / / |/| | |
* | | | fixes the issueTiago Botelho2017-01-121-1/+1
|/ / /
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-093-10/+24
|\ \ \ | | |/ | |/|
| * | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-063-10/+24
| |\ \
| | * | Fixed testsJose Ivan Vargas2017-01-031-3/+3
| | * | Added tests for the MembersController and corrected some more testsJose Ivan Vargas2017-01-031-0/+14
| | * | Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-031-2/+2
| | * | Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-031-7/+7
| | |/
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-041-15/+45
|\ \ \ | |/ /
| * | Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-031-15/+45
| |/
* | fix pipelines/index.html.haml merge conflictRegis2017-01-025-3/+140
|\ \ | |/
| * Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+31
| * applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-234-8/+10
| * adds specs for respective behaviourTiago Botelho2016-12-214-2/+107
* | merge master and fix application.rb conflictRegis2016-12-233-4/+79
|\ \ | |/
| * Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
| |\
| | * Removes builds tab from merge requestFilipa Lacerda2016-12-211-4/+0
| * | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+58
| |\ \
| | * | Add new testsZ.J. van de Weg2016-12-211-1/+6
| | * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-0/+53
| | |\ \
| | | * | Add controller testZ.J. van de Weg2016-12-201-0/+53
| * | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-211-0/+21
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | added more specsJames Lopez2016-12-211-2/+2