diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:08:51 +0300 |
commit | 38149afcf95e7669a7a99828c579d185b70c04dc (patch) | |
tree | 3a90504bd926407c0cc60f44e20dba08217b928b /config/initializers/omniauth.rb | |
parent | be660fe1d28a65ad61be24c71e66ae90f6488dc4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/omniauth.rb')
-rw-r--r-- | config/initializers/omniauth.rb | 4 |
1 files changed, 4 insertions, 0 deletions
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? |