Merge branch '27280-fix-unititalized-constant-ee' into 'master'

[EE] Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS"

See merge request !1124

app/models/application_setting.rb

@@ -14,55 +14,6 @@ class ApplicationSetting < ActiveRecord::Base
                             [\r\n]          # any number of newline characters
                           }x
 
-  DEFAULTS_CE = {
-    after_sign_up_text: nil,
-    akismet_enabled: false,
-    container_registry_token_expire_delay: 5,
-    default_branch_protection: Settings.gitlab['default_branch_protection'],
-    default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
-    default_projects_limit: Settings.gitlab['default_projects_limit'],
-    default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
-    disabled_oauth_sign_in_sources: [],
-    domain_whitelist: Settings.gitlab['domain_whitelist'],
-    gravatar_enabled: Settings.gravatar['enabled'],
-    help_page_text: nil,
-    housekeeping_bitmaps_enabled: true,
-    housekeeping_enabled: true,
-    housekeeping_full_repack_period: 50,
-    housekeeping_gc_period: 200,
-    housekeeping_incremental_repack_period: 10,
-    import_sources: Gitlab::ImportSources.values,
-    koding_enabled: false,
-    koding_url: nil,
-    max_artifacts_size: Settings.artifacts['max_size'],
-    max_attachment_size: Settings.gitlab['max_attachment_size'],
-    plantuml_enabled: false,
-    plantuml_url: nil,
-    recaptcha_enabled: false,
-    repository_checks_enabled: true,
-    repository_storages: ['default'],
-    require_two_factor_authentication: false,
-    restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
-    session_expire_delay: Settings.gitlab['session_expire_delay'],
-    send_user_confirmation_email: false,
-    shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
-    shared_runners_text: nil,
-    sidekiq_throttling_enabled: false,
-    sign_in_text: nil,
-    signin_enabled: Settings.gitlab['signin_enabled'],
-    signup_enabled: Settings.gitlab['signup_enabled'],
-    two_factor_grace_period: 48,
-    user_default_external: false
-  }
-
-  DEFAULTS_EE = {
-    elasticsearch_host: ENV['ELASTIC_HOST'] || 'localhost',
-    elasticsearch_port: ENV['ELASTIC_PORT'] || '9200',
-    usage_ping_enabled: true
-  }
-
-  DEFAULTS = DEFAULTS_CE.merge(DEFAULTS_EE)
-
   serialize :restricted_visibility_levels
   serialize :import_sources
   serialize :disabled_oauth_sign_in_sources, Array
@@ -218,14 +169,72 @@ class ApplicationSetting < ActiveRecord::Base
 
   def self.expire
     Rails.cache.delete(CACHE_KEY)
+  rescue
+    # Gracefully handle when Redis is not available. For example,
+    # omnibus may fail here during assets:precompile.
   end
 
   def self.cached
     Rails.cache.fetch(CACHE_KEY)
   end
 
+  def self.defaults_ce
+    {
+      after_sign_up_text: nil,
+      akismet_enabled: false,
+      container_registry_token_expire_delay: 5,
+      default_branch_protection: Settings.gitlab['default_branch_protection'],
+      default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
+      default_projects_limit: Settings.gitlab['default_projects_limit'],
+      default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
+      disabled_oauth_sign_in_sources: [],
+      domain_whitelist: Settings.gitlab['domain_whitelist'],
+      gravatar_enabled: Settings.gravatar['enabled'],
+      help_page_text: nil,
+      housekeeping_bitmaps_enabled: true,
+      housekeeping_enabled: true,
+      housekeeping_full_repack_period: 50,
+      housekeeping_gc_period: 200,
+      housekeeping_incremental_repack_period: 10,
+      import_sources: Gitlab::ImportSources.values,
+      koding_enabled: false,
+      koding_url: nil,
+      max_artifacts_size: Settings.artifacts['max_size'],
+      max_attachment_size: Settings.gitlab['max_attachment_size'],
+      plantuml_enabled: false,
+      plantuml_url: nil,
+      recaptcha_enabled: false,
+      repository_checks_enabled: true,
+      repository_storages: ['default'],
+      require_two_factor_authentication: false,
+      restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
+      session_expire_delay: Settings.gitlab['session_expire_delay'],
+      send_user_confirmation_email: false,
+      shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
+      shared_runners_text: nil,
+      sidekiq_throttling_enabled: false,
+      sign_in_text: nil,
+      signin_enabled: Settings.gitlab['signin_enabled'],
+      signup_enabled: Settings.gitlab['signup_enabled'],
+      two_factor_grace_period: 48,
+      user_default_external: false
+    }
+  end
+
+  def self.defaults_ee
+    {
+      elasticsearch_host: ENV['ELASTIC_HOST'] || 'localhost',
+      elasticsearch_port: ENV['ELASTIC_PORT'] || '9200',
+      usage_ping_enabled: true
+    }
+  end
+
+  def self.defaults
+    defaults_ce.merge(defaults_ee)
+  end
+
   def self.create_from_defaults
-    create(DEFAULTS)
+    create(defaults)
   end
 
   def elasticsearch_host

config/initializers/1_settings.rb

@@ -531,10 +531,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

config/initializers/5_backend.rb

-# 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)
 

lib/gitlab/current_settings.rb

@@ -30,7 +30,7 @@ module Gitlab
     end
 
     def in_memory_application_settings
-      @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting::DEFAULTS)
+      @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults)
     # In case migrations the application_settings table is not created yet,
     # we fallback to a simple OpenStruct
     rescue ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeError
@@ -38,7 +38,7 @@ module Gitlab
     end
 
     def fake_application_settings
-      OpenStruct.new(::ApplicationSetting::DEFAULTS)
+      OpenStruct.new(::ApplicationSetting.defaults)
     end
 
     private