diff options
| author | Fabio Pitino <fpitino@gitlab.com> | 2019-05-16 09:03:38 +0100 |
|---|---|---|
| committer | Fabio Pitino <fpitino@gitlab.com> | 2019-05-16 09:03:38 +0100 |
| commit | 8e8f9d711b221f578a17b014ff04ea5ec710f4db (patch) | |
| tree | 1af7184b9fe5d64d7963baf550f160fcdce62b18 | |
| parent | a3335e5e3bad36e1abc78a1a59ec4638c6c060e7 (diff) | |
| download | gitlab-ce-dont-lock-mr-if-pipelines-disabled.tar.gz | |
Fix Rubocop offensesdont-lock-mr-if-pipelines-disabled
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ae098bbb29a..a2a5a8ccba5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1031,6 +1031,7 @@ class MergeRequest < ApplicationRecord def mergeable_ci_state? return true unless check_pipeline_for_merge? + actual_head_pipeline&.success? || actual_head_pipeline&.skipped? end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 64fe3157274..c074d15c79e 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2186,7 +2186,7 @@ describe MergeRequest do subject { build(:merge_request, target_project: project) } context 'when project builds are disabled' do - before do + before do project.project_feature.update(builds_access_level: ProjectFeature::DISABLED) end |