gitlab-org--gitlab-foss/spec/controllers
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:

![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif)

@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 Enable RSpec/NotToNot cop and auto-correct offenses 2016-05-24 15:40:29 -04:00
ci Redirect to root path when visiting /ci 2016-03-29 08:04:17 +02:00
groups Remove group members check 2016-04-18 11:12:28 -03:00
import Backport GitHub Enterprise import support from EE 2016-04-26 21:00:55 -07:00
profiles Make /profile/keys/new redirects to /profile/keys for back-compat 2016-04-15 09:45:58 +02:00
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 Add AbuseReport#notify 2016-01-04 18:59:42 -05:00
application_controller_spec.rb Fix some specs 2016-03-20 22:55:08 +01:00
autocomplete_controller_spec.rb Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
blob_controller_spec.rb
commit_controller_spec.rb Add support to cherry-pick any commit 2016-04-18 15:39:07 +08:00
groups_controller_spec.rb Fix sorting issues/mrs by votes on the groups page 2016-03-21 17:01:38 -03:00
health_check_controller_spec.rb Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
help_controller_spec.rb
invites_controller_spec.rb
namespaces_controller_spec.rb Fix more specs 2016-03-20 23:09:33 +01:00
projects_controller_spec.rb Project#show on projects pending deletion will 404 2016-05-28 03:14:43 -07:00
registrations_controller_spec.rb Update tests for the current_application_settings request store changes 2016-05-27 19:05:52 -07:00
root_controller_spec.rb Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences. 2016-03-24 19:59:54 +01:00
sent_notifications_controller_spec.rb Move a few controller specs to their correct locations 2016-02-18 21:50:49 -05:00
sessions_controller_spec.rb Merge branch 'upgrade-devise-two-factor' into 'master' 2016-06-02 00:44:41 +00:00
snippets_controller_spec.rb Fix raw private snippets access workflow 2015-11-25 18:16:27 -02:00
uploads_controller_spec.rb Fix more specs 2016-03-20 23:09:33 +01:00
users_controller_spec.rb Add specs for user routing and update spec for user controller 2016-05-08 22:06:19 +07:00