diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-05-21 17:14:19 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-05-21 17:14:19 +0000 |
| commit | 868a2ac4def8492e9e1b7f8ac26134188ae20859 (patch) | |
| tree | 555cb480ad6e88c8b48684b4d6d62c49f1933b02 /spec | |
| parent | 043244a0fedf55ff50e08212598d414f3b31c4ba (diff) | |
| parent | e082090e1f86366c5a18553a36238b1c73dd2e6b (diff) | |
| download | gitlab-ce-868a2ac4def8492e9e1b7f8ac26134188ae20859.tar.gz | |
Merge branch 'bw-remove-constant-warnings' into 'master'
Remove 'already initialized constant' warnings
See merge request gitlab-org/gitlab-ce!28518
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/helpers/stub_configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb index 3e507fb133e..f6c613ad5aa 100644 --- a/spec/support/helpers/stub_configuration.rb +++ b/spec/support/helpers/stub_configuration.rb @@ -2,7 +2,8 @@ require 'active_support/core_ext/hash/transform_values' require 'active_support/hash_with_indifferent_access' require 'active_support/dependencies' -require_dependency 'gitlab' +# check gets rid of already initialized constant warnings when using spring +require_dependency 'gitlab' unless defined?(Gitlab) module StubConfiguration def stub_application_setting(messages) |