diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-02-15 10:47:13 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-02-15 10:47:13 +0000 |
| commit | b079a6b6bbe67b00c6ab181058ee2383e1b3c7de (patch) | |
| tree | ec2b1e2d5ac3bacccc3a2d80abe3b7a34bc904ba /app | |
| parent | ecb1411fbb057e65d3efea53854ba2efc16cb6d3 (diff) | |
| download | gitlab-ce-b079a6b6bbe67b00c6ab181058ee2383e1b3c7de.tar.gz | |
Base pipeline must be from target branch
Diffstat (limited to 'app')
| -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 2035bffd829..790555ab045 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1322,7 +1322,7 @@ class MergeRequest < ActiveRecord::Base def base_pipeline @base_pipeline ||= project.ci_pipelines .order(id: :desc) - .find_by(sha: diff_base_sha) + .find_by(sha: diff_base_sha, ref: target_branch) end def discussions_rendered_on_frontend? |