diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/0_license.rb | 2 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index 5c4546f499f..19c71c34904 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -10,7 +10,7 @@ Gitlab.ee do end # Needed to run migration - if Gitlab::Database.cached_table_exists?('licenses') + if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('licenses') message = LicenseHelper.license_message(signed_in: true, is_admin: true, in_html: false) if ::License.block_changes? && message.present? warn "WARNING: #{message}" diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index ef23ca065c6..0e4cb88b50f 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -16,3 +16,7 @@ OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_s OmniAuth.config.before_request_phase do |env| Gitlab::RequestForgeryProtection.call(env) end + +# Use json formatter +OmniAuth.config.logger.formatter = Gitlab::OmniauthLogging::JSONFormatter.new +OmniAuth.config.logger.level = Logger::ERROR if Rails.env.production? |