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

..

abuse_report_mailer

Fix the abuse report detail URL in the HTML email template

2016-01-05 18:02:12 -05:00

abuse_reports

Standardize the way we check for and display form errors

2016-04-04 21:37:07 -04:00

admin

Merge branch 'separate-banzai-references' into 'master'

2016-06-01 15:51:59 +00:00

ci

Redirect to root path when visiting /ci

2016-03-29 08:04:17 +02:00

dashboard

Merge branch 'rs-remove-issue_to_atom' into 'master'

2016-05-25 20:51:53 +00:00

devise

Pass the "Remember me" value to the 2FA token form

2016-05-30 22:25:35 -04:00

doorkeeper

Fix grammar and wording in text on various pages.

2016-05-22 10:41:30 -06:00

email_rejection_mailer

We'll get the <p> for free.

2015-08-19 12:38:08 -07:00

emojis

Updated UI of award emoji

2016-03-11 09:02:43 +00:00

errors

Add a page title to every page.

2015-04-30 19:12:15 +02:00

events

Merge branch 'separate-banzai-references' into 'master'

2016-06-01 15:51:59 +00:00

explore

Start builds redesign

2016-05-04 16:45:37 -05:00

groups

Merge branch 'rs-remove-issue_to_atom' into 'master'

2016-05-25 20:51:53 +00:00

help

Start builds redesign

2016-05-04 16:45:37 -05:00

import

Fixed issue with GitLab import buttons having a spinner

2016-05-24 15:00:25 +01:00

invites

Add a page title to every page.

2015-04-30 19:12:15 +02:00

issues

Remove issue_to_atom helper

2016-05-23 17:06:26 -04:00

kaminari/gitlab

Upgrade Kaminari from 0.16.3 to 0.17.0.

2016-05-31 14:14:16 -06:00

layouts

Put project Files and Commits tabs under Code tab

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

notify

Added author to various Markdown calls in views

2016-05-26 17:14:06 +02:00

profiles

Merge branch 'fix-grammar-issues' into 'master'

2016-05-25 19:26:22 +00:00

projects

Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'

2016-06-03 12:41:58 +00:00

repository_check_mailer

Improve 'auto fsck' admin emails

2016-04-18 10:58:40 +02:00

search

Added author to various Markdown calls in views

2016-05-26 17:14:06 +02:00

shared

issuable#labels_array explicitly load the labels

2016-06-02 21:43:01 +02:00

sherlock

Start builds redesign

2016-05-04 16:45:37 -05:00

snippets

Updated snippets UI

2016-05-18 14:11:06 +01:00

users

Attempt to fix the user page.

2016-06-01 19:42:49 -06:00

votes

AwardsHandler follows code style conventions

2016-04-26 11:25:58 +03:00