Skip to content

G
gitlab-ce
Commit 4a556dcb authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

resolve ee/spec/spec_helper

parent 7a709b84
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/spec_helper.rb
View file @ 4a556dcb
...@@ -30,11 +30,8 @@ end ...@@ -30,11 +30,8 @@ end
# require rainbow gem String monkeypatch, so we can test SystemChecks # require rainbow gem String monkeypatch, so we can test SystemChecks
require 'rainbow/ext/string' require 'rainbow/ext/string'
Rainbow.enabled = false Rainbow.enabled = false
<<<<<<< HEAD
require_relative '../ee/spec/spec_helper' require_relative '../ee/spec/spec_helper'
=======
>>>>>>> upstream/master
# Requires supporting ruby files with custom matchers and macros, etc, # Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories. # in spec/support/ and its subdirectories.
......
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