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

..

config

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

controllers

Don't allow merges with new commits

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

factories

Improve note factory

2016-05-29 15:03:00 -04:00

features

Merge branch 'fix-cancelable-retryable' into 'master'

2016-06-01 14:21:03 +00:00

finders

Make upcoming milestone work across projects

2016-05-16 10:25:24 +01:00

fixtures

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

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

helpers

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643

2016-05-23 23:08:00 +03:00

lib

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

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

mailers

Update tests for the current_application_settings request store changes

2016-05-27 19:05:52 -07:00

models

Fix note validation spec failures

2016-06-01 10:31:46 -07:00

requests

Add sha parameter to MR accept API

2016-06-01 20:29:54 +01:00

routing

Merge branch 'health-check-route'

2016-05-12 16:39:03 -05:00

services

Merge branch 'current-settings-use-request-store-during-request'

2016-06-01 12:55:00 +02:00

support

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

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

tasks/gitlab

Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table

2016-05-25 10:47:09 -07:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

factories_spec.rb

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Update rspec-rails from 3.3.3 to 3.4.2.

2016-05-01 13:44:50 -06:00

teaspoon_env.rb

Add leading comment space cop

2016-05-31 19:33:46 -03:00