diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 14:10:07 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-05 11:36:26 +0700 |
| commit | 18889696bda82d6ec50f97ca06edc97ff49d8fb4 (patch) | |
| tree | a8b244da5c8ec8ecc3b532146957ed65e55cfa35 /app/mailers | |
| parent | 7b4130d0f7390629d683e4365279ab5554bbcfc4 (diff) | |
| download | gitlab-ce-18889696bda82d6ec50f97ca06edc97ff49d8fb4.tar.gz | |
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.rb | 2 |
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 |