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
..
assets	Merge branch 'issue_18102' into 'master'	2016-06-02 17:15:26 +00:00
controllers	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	2016-06-03 12:41:58 +00:00
finders	Reorder the todos because the use of the project finder attempts to order them differently	2016-06-02 14:17:46 -07:00
helpers	Merge branch 'rs-todo-has-tooltip' into 'master'	2016-06-02 20:20:18 +00:00
mailers	New confirmation email 🔥	2016-05-25 16:56:06 -04:00
models	Merge branch '13312-remove-issuable-is_assigned' into 'master'	2016-06-03 11:45:05 +00:00
services	fix some issues and improved error output for forking	2016-06-02 21:48:26 -04:00
uploaders	Remove reduntant move_to_store override	2016-03-30 12:50:19 +02:00
validators	Allow webhooks URL to have leading and trailing spaces	2016-02-26 14:34:06 -05:00
views	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	2016-06-03 12:41:58 +00:00
workers	Update repository_import_worker.rb	2016-06-02 21:48:27 -04:00