diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-02 17:00:16 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-02 17:00:16 +0100 |
| commit | 04fdf4b9a926129d63d0483ad8cd7e748f3a4e07 (patch) | |
| tree | 9a9e0ea7425a2fa8828a4af13410911f5e346a50 | |
| parent | f680eca912f854373fc538ae1e9d0dcb60fcd310 (diff) | |
| download | gitlab-ce-04fdf4b9a926129d63d0483ad8cd7e748f3a4e07.tar.gz | |
fixup! Add `sha` parameter to MR accept 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 50baf4c09ad..db304abe1c3 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -235,7 +235,7 @@ module API render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged? if params[:sha] && merge_request.source_sha != params[:sha] - render_api_error!("SHA does not match HEAD of source branch: #{merge_request.target_sha}", 409) + render_api_error!("SHA does not match HEAD of source branch: #{merge_request.source_sha}", 409) end merge_params = { |