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	Add Application Setting to configure Container Registry token expire delay (default 5min)	2016-05-31 13:23:13 +02:00
ci	Redirect to root path when visiting /ci	2016-03-29 08:04:17 +02:00
concerns	Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'	2016-05-18 12:48:23 -05:00
dashboard	Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'	2016-05-18 12:48:23 -05:00
explore	Merge branch 'master' into issue_12658	2016-03-21 23:22:21 +01:00
groups	Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'	2016-05-18 12:48:23 -05:00
import
oauth	Include GonHelper separately and remove created_at in factory	2016-04-14 07:25:27 -07:00
profiles	Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'	2016-05-18 12:48:23 -05:00
projects	Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'	2016-06-03 12:41:58 +00:00
sherlock
abuse_reports_controller.rb	Autofill abuse message text with user url. Closes #2838	2016-01-16 10:47:12 -05:00
application_controller.rb	Merge branch 'upgrade-devise-two-factor' into 'master'	2016-06-02 00:44:41 +00:00
autocomplete_controller.rb	Updated Ruby	2016-05-25 15:26:02 +01:00
confirmations_controller.rb	Improved confirmation UX	2016-04-21 20:20:09 -04:00
dashboard_controller.rb	Restrict starred projects to viewable ones	2016-05-10 18:13:52 +01:00
emojis_controller.rb	Update award_emoji test	2016-02-23 19:37:15 -06:00
groups_controller.rb	Projects on group page should be sorted by last activity instead of id/created_at	2016-04-14 11:00:24 +02:00
health_check_controller.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.rb	Simplify random user generation.	2016-04-16 16:00:30 -04:00
invites_controller.rb
jwt_controller.rb	Make authentication service for Container Registry to be compatible with < Docker 1.11	2016-05-30 16:57:39 +02:00
namespaces_controller.rb	Prevent projects to have higher visibility than groups	2016-03-10 10:38:36 -03:00
omniauth_callbacks_controller.rb	Enable Style/MethodDefParentheses rubocop cop	2016-05-30 12:08:53 +02:00
passwords_controller.rb	Allow the initial admin to set a password	2016-03-04 17:37:57 -05:00
profiles_controller.rb	Merge branch 'master' into issue_7959	2016-03-22 11:13:27 -05:00
projects_controller.rb	Split Markdown rendering & reference gathering	2016-05-26 17:14:00 +02:00
registrations_controller.rb	current_user.confirmed_at.present? => current_user.confirmed?	2016-05-20 13:52:42 -04:00
root_controller.rb	Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences.	2016-03-24 19:59:54 +01:00
search_controller.rb	Updated based on feedback	2016-04-26 09:04:35 +01:00
sent_notifications_controller.rb
sessions_controller.rb	Pass the "Remember me" value to the 2FA token form	2016-05-30 22:25:35 -04:00
snippets_controller.rb	user routings refactor	2016-05-08 15:27:33 +07:00
uploads_controller.rb	Branded login page also in CE	2016-02-26 15:50:51 +01:00
users_controller.rb	Group the contributing calendar by day	2016-05-16 12:22:17 +01:00