Merge branch 'ce-6420-unify-spec_helper.rb' into 'master'

CE: Resolve "Extract EE specific files/lines for spec/spec_helper.rb"

See merge request gitlab-org/gitlab-ce!19851
This commit is contained in:
Nick Thomas 2018-06-14 15:04:57 +00:00
commit 3ec72f517a
1 changed files with 1 additions and 0 deletions

View File

@ -87,6 +87,7 @@ RSpec.configure do |config|
config.include LiveDebugger, :js
config.include MigrationsHelpers, :migration
config.include RedisHelpers
config.include Rails.application.routes.url_helpers, type: :routing
if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing.