diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-28 11:13:32 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-29 14:12:49 +0100 |
| commit | a49e9949c6bc474c8bfd4016d9c6c3b59776772f (patch) | |
| tree | fd8efa2f374885a1c12c7eb0e2c0224de3727a24 /lib/api | |
| parent | b8f9949a70005978e83a3aaffbe0836c75d24b74 (diff) | |
| download | gitlab-ce-a49e9949c6bc474c8bfd4016d9c6c3b59776772f.tar.gz | |
Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipeline
Diffstat (limited to 'lib/api')
| -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 90fa588b455..97baebc1d27 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -192,7 +192,7 @@ module API should_remove_source_branch: params[:should_remove_source_branch] } - if params[:merge_when_build_succeeds] && merge_request.pipeline && merge_request.pipeline.active? + if params[:merge_when_build_succeeds] && merge_request.head_pipeline && merge_request.head_pipeline.active? ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params). execute(merge_request) else |