Douwe Maan 0e2490c0cb Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' ... Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI:  @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh 😃 Closes #14139. See merge request !4414		2016-06-03 12:41:58 +00:00
..
admin	…
ci	…
groups	…
import	…
profiles	…
projects	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	2016-06-03 12:41:58 +00:00
abuse_reports_controller_spec.rb	…
application_controller_spec.rb	…
autocomplete_controller_spec.rb	…
blob_controller_spec.rb	…
commit_controller_spec.rb	…
groups_controller_spec.rb	…
health_check_controller_spec.rb	…
help_controller_spec.rb	…
invites_controller_spec.rb	…
namespaces_controller_spec.rb	…
projects_controller_spec.rb	…
registrations_controller_spec.rb	…
root_controller_spec.rb	…
sent_notifications_controller_spec.rb	…
sessions_controller_spec.rb	…
snippets_controller_spec.rb	…
uploads_controller_spec.rb	…
users_controller_spec.rb	…