diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 11:20:18 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 11:20:18 +0000 |
| commit | 3ee72501882a48b89f14a58f0c6093d35c7bf9cd (patch) | |
| tree | 0dd3d1337dedece891e3d6c55d98d4cdf5775d92 /app/controllers | |
| parent | 9d95dfe6018a6d039bc4f0d9ff42131b0ff9505c (diff) | |
| parent | 5797106dc8ba885615a62ddd6492d66f3437058e (diff) | |
| download | gitlab-ci-3ee72501882a48b89f14a58f0c6093d35c7bf9cd.tar.gz | |
Merge branch 'service-testing' into 'master'
Fix service testing
Fixes:
- https://gitlab.com/gitlab-org/gitlab-ci/issues/248
- https://gitlab.com/gitlab-org/gitlab-ci/issues/208
/cc @vsizov
See merge request !221
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/services_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 64bc698..c400776 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -31,7 +31,7 @@ class ServicesController < ApplicationController if @service.execute(last_build) message = { notice: 'We successfully tested the service' } else - message = { alert: 'We tried to test the service but error occured' } + message = { alert: 'We tried to test the service but error occurred' } end redirect_to :back, message |