Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-03-01 08:10:07 +0300
committerShinya Maeda <shinya@gitlab.com>2019-03-05 07:36:26 +0300
commit18889696bda82d6ec50f97ca06edc97ff49d8fb4 (patch)
treea8b244da5c8ec8ecc3b532146957ed65e55cfa35 /app/mailers
parent7b4130d0f7390629d683e4365279ab5554bbcfc4 (diff)
Rename ambiguous association names in Ci::Pipeline
fix it ok Fix head pipeline
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/pipelines.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb
index 31e183640ad..fb57c0da34d 100644
--- a/app/mailers/emails/pipelines.rb
+++ b/app/mailers/emails/pipelines.rb
@@ -15,7 +15,7 @@ module Emails
def pipeline_mail(pipeline, recipients, status)
@project = pipeline.project
@pipeline = pipeline
- @merge_request = pipeline.merge_requests.first
+ @merge_request = pipeline.merge_requests_as_head_pipeline.first
add_headers
# We use bcc here because we don't want to generate this emails for a