summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-0/+20
* Merge branch 'zj-fix-admin-templates' into 'master' Kamil Trzciński2017-01-201-0/+26
* Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-191-16/+32
* Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-191-0/+30
* Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-192-0/+116
* Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-191-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
| | * | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-201-0/+21
| | |/ /
* | | | Add controller specs for pipeline index API endpointGrzegorz Bizon2016-12-211-1/+21
|/ / /
* | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+47
|\ \ \ | |/ / |/| |
| * | Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelinesGrzegorz Bizon2016-12-201-9/+10
| * | Move test for HTML stage endpoint to controller specsGrzegorz Bizon2016-12-201-0/+46
| |/
* | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-202-207/+52
|\ \
| * | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-192-2/+2
| * | Modify GithubImport to support GiteaRémy Coutable2016-12-191-1/+1
| * | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-192-208/+53
* | | Add terminal UI and controller actionsFatih Acet2016-12-191-0/+1
* | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-191-0/+68
| |/ |/|
* | Fix 500 error for invalid path when visiting blame pageJeff Stubler2016-12-171-0/+5
|/
* Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-162-0/+110
|\
| * Add a controller spec for personal access tokens.Timothy Andrew2016-12-161-0/+49
| * Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-0/+61
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-146-12/+147
|\ \ | |/
| * Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-131-0/+55
| |\
| | * Allow to delete tag release noteissue_13270Felipe Artur2016-12-121-0/+55
| * | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-1/+14
| |/
| * fix: 24982- Remove'Signed in successfully' messagejnoortheen2016-12-071-1/+0
| * Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-051-0/+60
| * Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-1/+3
| |\
View Lorry Controller Status