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

..

avatars_controller_spec.rb

Fix specs

2016-03-21 09:09:59 +01:00

blame_controller_spec.rb

Move a few controller specs to their correct locations

2016-02-18 21:50:49 -05:00

branches_controller_spec.rb

Update test since branch removal does not render template anymore

2016-06-03 10:13:40 +03:00

commit_controller_spec.rb

Ensure Commit#show responds 404 instead of 500 when given an invalid ID

2016-02-15 15:48:16 -05:00

commits_controller_spec.rb

Move a few controller specs to their correct locations

2016-02-18 21:50:49 -05:00

compare_controller_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

find_file_controller_spec.rb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2016-01-07 12:56:18 +01:00

forks_controller_spec.rb

Make better use of the visibility_level factory traits

2016-03-08 16:40:45 -05:00

group_links_controller_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

imports_controller_spec.rb

Fix denting and spec

2016-03-13 13:44:31 +01:00

issues_controller_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

merge_requests_controller_spec.rb

Don't allow merges with new commits

2016-06-01 20:34:41 +01:00

milestones_controller_spec.rb

Fix spec that broke due to fact that iid is needed, not id, for MilestonesController

2015-12-05 00:04:44 -08:00

notification_settings_controller_spec.rb

Let users set notification levels in projects which they are not members

2016-05-17 21:53:03 -05:00

project_members_controller_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

protected_branches_controller_spec.rb

Fix broken project_url routing when protected branches are accessed with an empty repo

2015-03-01 20:26:21 -08:00

raw_controller_spec.rb

Change deprecated usage of rendering without response body

2016-03-16 03:16:25 +02:00

refs_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

repositories_controller_spec.rb

Use a custom Devise failure app to handle unauthenticated .zip requests

2016-03-08 23:49:30 -05:00

services_controller_spec.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

snippets_controller_spec.rb

Ensure private project snippets are not viewable by unauthorized people

2016-03-25 12:33:42 +01:00

tree_controller_spec.rb

Fix specs

2015-12-18 17:09:58 +01:00

uploads_controller_spec.rb

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00