diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 09:52:39 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 09:52:39 +0200 |
| commit | 72a425fa6656b397feb6c4d5bfec7b251cf2675d (patch) | |
| tree | 0c3731ad092baa1376809f3930b6784320b9473d /features/support/env.rb | |
| parent | a3e1d7cf9312ba543cf860dbc3e895b4839aba59 (diff) | |
| parent | 4a0fa27017e3bdf33a61d198f692419359cd6c05 (diff) | |
| download | gitlab-ce-72a425fa6656b397feb6c4d5bfec7b251cf2675d.tar.gz | |
Merge branch 'remove-satellites'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features/support/env.rb')
| -rw-r--r-- | features/support/env.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 672251af084..62c80b9c948 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -28,5 +28,9 @@ Spinach.hooks.before_run do RSpec::Mocks.setup TestEnv.init(mailer: false) + # skip pre-receive hook check so we can use + # web editor and merge + TestEnv.disable_pre_receive + include FactoryGirl::Syntax::Methods end |