fixup! Add `sha` parameter to MR accept API

04fdf4b9 · Sean McGivern · f680eca9 · 04fdf4b9
Commit 04fdf4b9 authored Jun 02, 2016 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/api/merge_requests.rb lib/api/merge_requests.rb +1 -1

No files found.
--- 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 = {