diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-24 06:01:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-24 06:01:49 +0000 |
| commit | 4477dc249e563e60e126d4f5ad2692297a9584c1 (patch) | |
| tree | c27478d37aff6f286870b6ff47f9c2b0614d1c19 | |
| parent | 9e43fc151b7d0efca8795e5fbb1fa39d9ed21322 (diff) | |
| parent | 6ba627f7d6e188b18bc20bdee0bc9166f95d9176 (diff) | |
| download | gitlab-ce-4477dc249e563e60e126d4f5ad2692297a9584c1.tar.gz | |
Merge branch 'fix-settings-spec' into 'master'
Fix settings_spec so that it can that run by itself
Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`.
See merge request !4893
| -rw-r--r-- | spec/initializers/settings_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/initializers/settings_spec.rb b/spec/initializers/settings_spec.rb index e58f2c80e95..1bcae8a27db 100644 --- a/spec/initializers/settings_spec.rb +++ b/spec/initializers/settings_spec.rb @@ -1,3 +1,4 @@ +require 'spec_helper' require_relative '../../config/initializers/1_settings' describe Settings, lib: true do |