summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-29 18:10:53 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-29 18:10:53 +0000
commitccd3f707651bad576346852988d5026902a3bb5a (patch)
treed9e0cb18e2641409b37d04f23388682e8b2b7dbf
parent85d6403278a4921c53d527f60a5d615b5d2d4da6 (diff)
parent519a791ef9a90541a1bb3825790bd46fd57756f9 (diff)
downloadgitlab-ce-ccd3f707651bad576346852988d5026902a3bb5a.tar.gz
Merge branch 'sentry-filter' into 'master'
Prevent Rails filtered parameters from leaking to Sentry. As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/ See merge request !3974
-rw-r--r--config/initializers/sentry.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index e87899b2d5c..74fef7cadfe 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -15,6 +15,9 @@ if Rails.env.production?
Raven.configure do |config|
config.dsn = current_application_settings.sentry_dsn
config.release = Gitlab::REVISION
+
+ # Sanitize fields based on those sanitized from Rails.
+ config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
end
end
end