diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 11:24:55 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 11:24:55 +0200 |
| commit | a39228db8027c966e8117d40766b0cef4fbd50f6 (patch) | |
| tree | 143045af7214ae6746e7b7c9df647c71ec2bd675 /config/initializers | |
| parent | 05f50c9b52fde54513fe55fef97499b35719eae2 (diff) | |
| parent | aed489bf901745ced6618e680913d0d213998923 (diff) | |
| download | gitlab-ce-docs-zm002-gitlab-case.tar.gz | |
Merge branch 'master' into docs-zm002-gitlab-casedocs-zm002-gitlab-case
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/0_inject_enterprise_edition_module.rb | 2 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 3 | ||||
| -rw-r--r-- | config/initializers/8_devise.rb | 2 | ||||
| -rw-r--r-- | config/initializers/rack_attack_logging.rb | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb index 4b21732e179..39595e23abe 100644 --- a/config/initializers/0_inject_enterprise_edition_module.rb +++ b/config/initializers/0_inject_enterprise_edition_module.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'active_support/inflector' + module InjectEnterpriseEditionModule def prepend_if_ee(constant) prepend(constant.constantize) if Gitlab.ee? diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 70e5dcd042e..143b34b5368 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -32,6 +32,9 @@ end Sidekiq.configure_server do |config| config.on(:startup) do + # webserver metrics are cleaned up in config.ru: `warmup` block + Prometheus::CleanupMultiprocDirService.new.execute + Gitlab::Metrics::SidekiqMetricsExporter.instance.start end end diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 3dd12c7e64d..8ef9ff6b7fc 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -81,7 +81,7 @@ Devise.setup do |config| # You can use this to let your user access some features of your application # without confirming the account, but blocking it after a certain period # (ie 2 days). - # config.allow_unconfirmed_access_for = 2.days + config.allow_unconfirmed_access_for = 30.days # Defines which key will be used when confirming an account # config.confirmation_keys = [ :email ] diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb index 7eb34bd69e5..b43fff24bb0 100644 --- a/config/initializers/rack_attack_logging.rb +++ b/config/initializers/rack_attack_logging.rb @@ -7,9 +7,9 @@ ActiveSupport::Notifications.subscribe('rack.attack') do |name, start, finish, r rack_attack_info = { message: 'Rack_Attack', env: req.env['rack.attack.match_type'], - ip: req.ip, + remote_ip: req.ip, request_method: req.request_method, - fullpath: req.fullpath + path: req.fullpath } if %w(throttle_authenticated_api throttle_authenticated_web).include? req.env['rack.attack.matched'] |