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
..
config	Enable the Rubocop DeprecatedClassMethods cop	2016-05-08 15:33:34 -06:00
controllers	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	2016-06-03 12:41:58 +00:00
factories	Improve note factory	2016-05-29 15:03:00 -04:00
features	Fix failing todo tests	2016-06-02 15:30:13 -07:00
finders	Make upcoming milestone work across projects	2016-05-16 10:25:24 +01:00
fixtures	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	2016-05-20 16:23:04 -05:00
helpers	Enable RSpec/NotToNot cop and auto-correct offenses	2016-05-24 15:40:29 -04:00
initializers	Add tests for setting trusted_proxies	2016-05-04 15:49:39 -07:00
javascripts	Move JS graph specs to match assets tree.	2016-06-01 19:48:01 -06:00
lib	Reduce Namespace queries in UserReferenceFilter	2016-06-02 14:01:42 +02:00
mailers	Update tests for the current_application_settings request store changes	2016-05-27 19:05:52 -07:00
models	issuable#labels_array explicitly load the labels	2016-06-02 21:43:01 +02:00
requests	Add sha parameter to MR accept API	2016-06-01 20:29:54 +01:00
routing	Merge branch 'health-check-route'	2016-05-12 16:39:03 -05:00
services	Merge branch '13313-fix-deprecation-warnings' into 'master'	2016-06-03 11:55:01 +00:00
support	Merge branch 'separate-banzai-references' into 'master'	2016-06-01 15:51:59 +00:00
tasks/gitlab	Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table	2016-05-25 10:47:09 -07:00
views	Move "I should see Crowd login form" feature to a view spec	2016-02-24 17:38:13 -05:00
workers	Enable RSpec/NotToNot cop and auto-correct offenses	2016-05-24 15:40:29 -04:00
factories_spec.rb	Enable RSpec/NotToNot cop and auto-correct offenses	2016-05-24 15:40:29 -04:00
rails_helper.rb
spec_helper.rb	Update rspec-rails from 3.3.3 to 3.4.2.	2016-05-01 13:44:50 -06:00
teaspoon_env.rb	Add leading comment space cop	2016-05-31 19:33:46 -03:00