diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 06:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 06:09:39 +0300 |
| commit | 52cacdb89bb29f355e0c3a33c3250ac2d3fea036 (patch) | |
| tree | 106e4128d0b9e454f60287c9895fc2182e82db21 /app/models | |
| parent | 9398d718d92a40a0a917040645a55dea51467a91 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/pipeline.rb | 1 | ||||
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 3ce44a066ae..8a3ca2e758c 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -736,6 +736,7 @@ module Ci MergeRequest.where(id: merge_request_id) else MergeRequest.where(source_project_id: project_id, source_branch: ref) + .by_commit_sha(sha) end end diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 30dfcc11417..1a85289a04f 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -153,6 +153,6 @@ class PrometheusService < MonitoringService def create_default_alerts return unless project_id - Prometheus::CreateDefaultAlertsWorker.perform_async(project_id: project_id) + Prometheus::CreateDefaultAlertsWorker.perform_async(project_id) end end |