diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 18:09:30 +0300 |
| commit | c6b3ec3f56fa32a0e0ed3de0d0878d25f1adaddf (patch) | |
| tree | 967afee9a510ff9dd503ebd83706dc760ec2e3ed /app/controllers/projects/prometheus | |
| parent | 903ccf7c93eb9490c76857bffe744249cc07de09 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/prometheus')
| -rw-r--r-- | app/controllers/projects/prometheus/alerts_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/prometheus/alerts_controller.rb b/app/controllers/projects/prometheus/alerts_controller.rb index 8c74c730de9..2c0521edece 100644 --- a/app/controllers/projects/prometheus/alerts_controller.rb +++ b/app/controllers/projects/prometheus/alerts_controller.rb @@ -26,12 +26,9 @@ module Projects def notify token = extract_alert_manager_token(request) + result = notify_service.execute(token) - if notify_service.execute(token) - head :ok - else - head :unprocessable_entity - end + head result.http_status end def create |