Skip to content

G
gitlab-ce
Commit d8e41083 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in spec/spec_helper.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 84825b39
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/spec_helper.rb
View file @ d8e41083
...@@ -93,14 +93,11 @@ RSpec.configure do |config| ...@@ -93,14 +93,11 @@ RSpec.configure do |config|
config.include WaitForRequests, :js config.include WaitForRequests, :js
config.include LiveDebugger, :js config.include LiveDebugger, :js
config.include MigrationsHelpers, :migration config.include MigrationsHelpers, :migration
<<<<<<< HEAD
# EE only START # EE only START
config.include EE::LicenseHelpers config.include EE::LicenseHelpers
config.include Rails.application.routes.url_helpers, type: :routing config.include Rails.application.routes.url_helpers, type: :routing
# EE only END # EE only END
=======
>>>>>>> upstream/master
if ENV['CI'] if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing. # This includes the first try, i.e. tests will be run 4 times before failing.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7