diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-18 18:06:36 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-18 18:06:36 +0000 |
| commit | ffc5fc6a38f4859f491b0669f939876afa865533 (patch) | |
| tree | 40590bab2397e5f48b4a2c211127b81f30a669be /app/controllers | |
| parent | 03933cd279f0870a16f126619380ec386d68345a (diff) | |
| parent | 1db1896ed2375481d53f74f7900d259fe068ef64 (diff) | |
| download | gitlab-ce-ffc5fc6a38f4859f491b0669f939876afa865533.tar.gz | |
Merge branch 'zj-slash-commands-mattermost' into 'master'
Slash command for mattermost
Closes #22540
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
See merge request !7438
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 40a23a6f806..30c2a5d9982 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -28,6 +28,8 @@ class Projects::ServicesController < Projects::ApplicationController end def test + return render_404 unless @service.can_test? + data = @service.test_data(project, current_user) outcome = @service.test(data) |