diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 19:48:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-07 01:50:58 +0300 |
| commit | 6ce25e7b4caa9e94de74378729178c7060d640b2 (patch) | |
| tree | 8f7b7ba4d83d20bffe7bb50fba1942fd6c9c5b80 /lib/api/merge_requests.rb | |
| parent | 18a5bb05204ee437902d82e5973a427b9aac6d53 (diff) | |
Rename MergeRequest methods that return commits or shas to be more clear and consistent
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 0e94efd4acd..4fcdf8968c9 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -233,8 +233,8 @@ module API render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable? - if params[:sha] && merge_request.source_sha != params[:sha] - render_api_error!("SHA does not match HEAD of source branch: #{merge_request.source_sha}", 409) + if params[:sha] && merge_request.diff_head_sha != params[:sha] + render_api_error!("SHA does not match HEAD of source branch: #{merge_request.diff_head_sha}", 409) end merge_params = { |