summaryrefslogtreecommitdiff
path: root/spec/initializers/settings_spec.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-03-14 14:42:49 +0100
committerJacob Vosmaer <jacob@gitlab.com>2018-03-21 18:18:32 +0100
commit008a6a6ce6fa943adcfecf3a606b845cfa282680 (patch)
treef98536d22e41415cb93a3e729ff49519cd37a13a /spec/initializers/settings_spec.rb
parentb3daf108aacc4ae363283d46395fe853fa06cccb (diff)
downloadgitlab-ce-008a6a6ce6fa943adcfecf3a606b845cfa282680.tar.gz
Route path lookups through legacy_disk_pathmark-legacy-git-access
Diffstat (limited to 'spec/initializers/settings_spec.rb')
-rw-r--r--spec/initializers/settings_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/initializers/settings_spec.rb b/spec/initializers/settings_spec.rb
index 838ca9fabef..57f5adbbc40 100644
--- a/spec/initializers/settings_spec.rb
+++ b/spec/initializers/settings_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'
-require_relative '../../config/initializers/1_settings'
+require_relative '../../config/initializers/1_settings' unless defined?(Settings)
describe Settings do
describe '#ldap' do