diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 17:19:18 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 17:59:04 +0300 |
commit | 021d3810c300d1e0514f21ccb6f1439f59e20565 (patch) | |
tree | 771a663395f39530559c73016f26087a0489fae2 /lib/api/merge_requests.rb | |
parent | 5accd87ad7b0d960e504910d896a832288e51c8d (diff) |
Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 4e7de8867b4..d129c510d63 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -238,7 +238,7 @@ module API should_remove_source_branch: params[:should_remove_source_branch] } - if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.ci_commit && merge_request.ci_commit.active? + if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.pipeline && merge_request.pipeline.active? ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params). execute(merge_request) else |