summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+43
|\
| * Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-204-38/+141
| |\
| * | WIPKamil Trzcinski2016-12-201-10/+11
| * | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-201-0/+3
| |\ \
| * | | Fix flowKamil Trzcinski2016-12-201-0/+1
| * | | Improve sourcesKamil Trzcinski2016-12-192-39/+41
| * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-12/+7
| * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1814-91/+148
| |\ \ \
| * | | | Incorporate reviewZ.J. van de Weg2016-12-161-1/+1
| * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-26/+0
| * | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-161-7/+7
| |\ \ \ \
| * | | | | Add auto configure of commandsZ.J. van de Weg2016-12-161-11/+8
| * | | | | Add MattermostControllerZ.J. van de Weg2016-12-161-0/+47
| * | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-161-1/+27
* | | | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-211-0/+2
|\ \ \ \ \ \
| * | | | | | fix reset pathfix/group-path-rename-errorJames Lopez2016-12-211-1/+1
| * | | | | | added more specsJames Lopez2016-12-211-0/+2
| * | | | | | update controller action to render error in formJames Lopez2016-12-211-4/+1
| * | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-201-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add tests for stage API endpointKamil Trzcinski2016-12-201-3/+1
| * | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-191-0/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1912-88/+141
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+12
* | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-203-35/+111
|\ \ \ \ \ \
| * | | | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-192-12/+20
| * | | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-1/+1
| * | | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-191-1/+1
| * | | | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-194-113/+101
| * | | | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-192-1/+81
| | |/ / / / | |/| | | |
* | | | | | Add terminal UI and controller actionsFatih Acet2016-12-191-5/+9
* | | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-191-1/+24
| |_|/ / / |/| | | |
* | | | | Fix 500 error for invalid path when visiting blame pageJeff Stubler2016-12-171-0/+3
|/ / / /
* | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-172-2/+2
|\ \ \ \
| * | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-162-2/+2
* | | | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-172-9/+12
|\ \ \ \ \
| * | | | | Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-memberDouglas Barbosa Alexandre2016-12-161-2/+2
| * | | | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-161-1/+3
| * | | | | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-161-10/+4
| * | | | | Adds sort dropdown for group membersNur Rony2016-12-162-4/+11
* | | | | | Merge branch 'fix/keep-compatility-ruby-21' into 'master' Stan Hu2016-12-161-1/+1
|\ \ \ \ \ \
| * | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1fix/keep-compatility-ruby-21Douglas Barbosa Alexandre2016-12-161-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-162-37/+48
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-167-11/+39
| |\ \ \ \ \ | | |/ / / /
| * | | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-151-0/+3
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1419-42/+113
| |\ \ \ \ \
| * | | | | | Handling OAuth2 errorsValery Sizov2016-12-091-1/+1
| * | | | | | BitBuckpet importer. Refactoring. Iteration 2Valery Sizov2016-12-071-1/+1
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-3022-74/+189
| |\ \ \ \ \ \
| * | | | | | | Fix remaining Bitbucket controller specsStan Hu2016-11-211-1/+1
View Lorry Controller Status