home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Rename MergeRequest methods that return commits or shas to be more clear and consistent

Browse Source
This commit is contained in:
Douwe Maan
2016-07-06 18:50:58 -04:00
parent 18a5bb0520
commit 6ce25e7b4c
25 changed files with 162 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/api/merge_requests.rb
+2 -2
View File
@@ -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 = {