diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
| commit | a2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch) | |
| tree | e7d5e3e097ef85b871c7ab5b4673e6903c294144 /features/support | |
| parent | 13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff) | |
| parent | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff) | |
| download | gitlab-ce-issue-board-sidebar.tar.gz | |
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'features/support')
| -rw-r--r-- | features/support/capybara.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index fe9e39cf509..dae0d0f918c 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -20,5 +20,5 @@ unless ENV['CI'] || ENV['CI_SERVER'] end Spinach.hooks.before_run do - TestEnv.warm_asset_cache + TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] end |