diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-27 21:18:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-27 21:18:41 +0000 |
| commit | 763d7ad2d99770873a76869987726bff2d703869 (patch) | |
| tree | df2f877cee4492a6847dd656db926ef54c613fc2 /config | |
| parent | 1f875e8e37a2144cd6c87b4735fa9c1e93e4dde7 (diff) | |
| parent | f575fe46a792593414f7f21533bfbbdceae2740c (diff) | |
| download | gitlab-ce-763d7ad2d99770873a76869987726bff2d703869.tar.gz | |
Merge branch '27280-fix-unititalized-constant' into 'master'
Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS"
Closes #27280
See merge request !8805
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 8 | ||||
| -rw-r--r-- | config/initializers/5_backend.rb | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 906ec11f012..4f33aad8693 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -419,10 +419,4 @@ if Rails.env.test? end # Force a refresh of application settings at startup -begin - ApplicationSetting.expire - Ci::ApplicationSetting.expire -rescue - # Gracefully handle when Redis is not available. For example, - # omnibus may fail here during assets:precompile. -end +ApplicationSetting.expire diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb index ed88c8ee1b8..2bd159ca7f1 100644 --- a/config/initializers/5_backend.rb +++ b/config/initializers/5_backend.rb @@ -1,9 +1,3 @@ -# GIT over SSH -require_dependency Rails.root.join('lib/gitlab/backend/shell') - -# GitLab shell adapter -require_dependency Rails.root.join('lib/gitlab/backend/shell_adapter') - required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required) current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.new.version) |