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

..

assets

New style for close buttons

2016-05-31 14:23:27 -06:00

controllers

Don't allow merges with new commits

2016-06-01 20:34:41 +01:00

finders

Fix error 500 when sorting issues by milestone due date and filtering by labels

2016-05-31 10:35:57 -03:00

helpers

Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master'

2016-05-30 17:26:57 +00:00

mailers

New confirmation email 🔥

2016-05-25 16:56:06 -04:00

models

Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'

2016-06-01 17:41:19 +00:00

services

Merge branch 'feature/improve_wiki_page_events' into 'master'

2016-05-31 18:10:23 +00:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Don't allow merges with new commits

2016-06-01 20:34:41 +01:00

workers

Make EmailsOnPushWorker use Sidekiq mailers queue

2016-05-31 15:06:08 -07:00