diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/models/merge_request.rb | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index cf2763180c4..b8f51b58fd3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1163,7 +1163,7 @@ class MergeRequest < ApplicationRecord # Since deployments run on a merge request ref (e.g. `refs/merge-requests/:iid/head`), # we cannot look up environments with source branch name. def environments - return Environment.none unless actual_head_pipeline&.triggered_by_merge_request? + return Environment.none unless actual_head_pipeline&.merge_request? actual_head_pipeline.environments end |