Sean McGivern f680eca912 Don't allow merges with new commits ...

Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.

2016-06-01 20:34:41 +01: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

Merge Builds and Pipelines tab into one

2016-05-28 19:26:08 +02: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

Don't allow merges with new commits

2016-06-01 20:34:41 +01: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

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

2016-06-01 15:51:59 +00: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

Merge branch 'updated-contrib-calendar' into 'master'

2016-05-25 23:29:41 +00:00

votes

AwardsHandler follows code style conventions

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