diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-11-16 09:38:58 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-11-16 09:38:58 -0600 |
| commit | e5d4f7ff277289af8fbffd392bc216ffb2d1d873 (patch) | |
| tree | 102f0a450c2476da80fa39649aed522c732b72f2 /app/models/merge_request.rb | |
| parent | 17d53e2bf5f9ec44d56bf92daf972007fc5f9bff (diff) | |
| parent | 624ec62238c1d26ef2745c1147edffde67a2b4e6 (diff) | |
| download | gitlab-ce-npm-namespace.tar.gz | |
Merge branch 'master' into npm-namespacenpm-namespace
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index df5678ec2f1..92add079a02 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -966,7 +966,6 @@ class MergeRequest < ActiveRecord::Base def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? - return true unless head_pipeline actual_head_pipeline&.success? || actual_head_pipeline&.skipped? end |