diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
| commit | 44fdf983bd35328dd577d3d3650d14163ef3e2b6 (patch) | |
| tree | 84ff300d056cfbabb5a0fe2a9cbaa80aaeab1cc5 /app/models/project_services | |
| parent | bc9fa07b26184b5c94808f704db6ea1ac81bf4de (diff) | |
| download | gitlab-ce-44fdf983bd35328dd577d3d3650d14163ef3e2b6.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/alerts_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project_services/alerts_service.rb b/app/models/project_services/alerts_service.rb index 2f7902d9617..16bf37fd189 100644 --- a/app/models/project_services/alerts_service.rb +++ b/app/models/project_services/alerts_service.rb @@ -15,6 +15,8 @@ class AlertsService < Service before_validation :ensure_token, if: :activated? def url + return if instance? || template? + url_helpers.project_alerts_notify_url(project, format: :json) end |