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

..

artifacts

Remove header title from project pages

2016-05-26 17:58:44 +02:00

badges

Remove header title from project pages

2016-05-26 17:58:44 +02:00

blame

Remove header title from project pages

2016-05-26 17:58:44 +02:00

blob

Remove header title from project pages

2016-05-26 17:58:44 +02:00

branches

Put project Files and Commits tabs under Code tab

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

builds

Merge Builds and Pipelines tab into one

2016-05-28 19:26:08 +02:00

buttons

Merge branch 'master' into project-navigation-redesign

2016-05-23 22:41:11 +02:00

ci

Pipelines can be canceled only when there are running builds

2016-05-31 15:26:00 +02:00

commit

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

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

commits

Put project Files and Commits tabs under Code tab

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

compare

Remove header title from project pages

2016-05-26 17:58:44 +02:00

container_registry

Remove header title from project pages

2016-05-26 17:58:44 +02:00

deploy_keys

Fixed project settings alert colors

2016-05-16 15:40:44 +01:00

diffs

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-20 16:23:04 -05:00

find_file

Remove header title from project pages

2016-05-26 17:58:44 +02:00

forks

change the css class has_tooltip to has-tooltip universally

2016-03-20 21:37:22 +01:00

generic_commit_statuses

Merge branch 'improve-pipeline-design' into 'master'

2016-05-25 20:50:26 +00:00

graphs

Attempt to fix the user page.

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

group_links

Fixed failing tests

2016-04-25 16:56:17 +01:00

hooks

Small fixes and added to the changelog

2016-05-30 17:41:27 -03:00

imports

Sanitize repo paths in new project error message

2016-05-04 14:06:07 -07:00

issues

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

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

labels

Remove header title from project pages

2016-05-26 17:58:44 +02:00

merge_requests

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

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

milestones

Remove header title from project pages

2016-05-26 17:58:44 +02:00

network

Remove header title from project pages

2016-05-26 17:58:44 +02:00

notes

Added author to various Markdown calls in views

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

pipelines

Refactor. Add tests.

2016-06-02 11:10:57 -04:00

project_members

Remove header title from project pages

2016-05-26 17:58:44 +02:00

protected_branches

Fixed project settings alert colors

2016-05-16 15:40:44 +01:00

refs

Fixes issue with file view rows not clickable on project main view

2016-02-23 09:06:26 +00:00

releases

Remove header title from project pages

2016-05-26 17:58:44 +02:00

repositories

Added author to various Markdown calls in views

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

runners

Fix grammar and wording in text on various pages.

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

services

Hide description on mobile

2016-05-26 09:15:56 +01:00

snippets

Remove header title from project pages

2016-05-26 17:58:44 +02:00

tags

Put project Files and Commits tabs under Code tab

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

tree

Put project Files and Commits tabs under Code tab

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

triggers

Resolve some issues Jacob brought up.

2016-05-24 09:04:43 -06:00

variables

Changed table border color

2016-05-16 10:26:11 +01:00

wikis

Remove header title from project pages

2016-05-26 17:58:44 +02:00

_activity.html.haml

fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back

2016-04-20 17:47:07 +01:00

_bitbucket_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_builds_settings.html.haml

Project settings UI update

2016-05-20 08:49:31 +01:00

_commit_button.html.haml

Automatically fork a project when not allowed to edit a file.

2015-12-18 10:03:34 +01:00

_errors.html.haml

Standardize the way we check for and display form errors

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

_files.html.haml

Update files/diffs to match new layout

2016-01-14 12:31:31 +01:00

_find_file_link.html.haml

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

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

_github_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_gitlab_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_home_panel.html.haml

Redesign project page header

2016-05-19 13:16:57 -05:00

_last_commit.html.haml

Cleanup changes

2016-04-13 15:58:22 +02:00

_last_push.html.haml

Start builds redesign

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

_md_preview.html.haml

Fixed typo in zen.scss and corresponding views

2016-05-04 14:04:13 -07:00

_readme.html.haml

Start builds redesign

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

_zen.html.haml

Fixed typo in zen.scss and corresponding views

2016-05-04 14:04:13 -07:00

activity.html.haml

Remove header title from project pages

2016-05-26 17:58:44 +02:00

edit.html.haml

Project settings UI update

2016-05-20 08:49:31 +01:00

empty.html.haml

Backend for a gitignores dropdown

2016-05-20 15:58:36 -05:00

new.html.haml

Return header title for new project page

2016-05-26 18:06:11 +02:00

no_repo.html.haml

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

remove_fork.js.haml

Adds ability to remove the forked relationship

2015-10-13 21:42:17 +11:00

show.atom.builder

Remove event_to_atom helper

2016-05-23 12:37:40 -04:00

show.html.haml

Move files tab before commits tab to follow same order as top navigation

2016-05-24 00:41:31 +02:00

transfer.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

update.js.haml

Move jQuery enable/disable extensions to extensions/jquery

2015-06-02 20:32:07 -04:00