diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
| commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
| tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /config/environments | |
| parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 6 | ||||
| -rw-r--r-- | config/environments/production.rb | 12 | ||||
| -rw-r--r-- | config/environments/test.rb | 6 |
3 files changed, 0 insertions, 24 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 71376b74cfa..6b44af3b658 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -22,12 +22,6 @@ Rails.application.configure do # Show a warning when a large data set is loaded into memory config.active_record.warn_on_records_fetched_greater_than = 1000 - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - # Raise an error on page load if there are pending migrations config.active_record.migration_error = :page_load diff --git a/config/environments/production.rb b/config/environments/production.rb index 202f6205c7f..8372331024f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,18 +65,6 @@ Rails.application.configure do # Enable threaded mode # config.threadsafe! unless $rails_rake_task - # Silence deprecation notices on production. - # See also config/initializers/00_deprecations.rb. - # - # Logging to `log/deprecation_json.log` can be enabled with - # `GITLAB_LOG_DEPRECATIONS=1`. - # - # See https://gitlab.com/gitlab-org/gitlab/-/issues/368379 - config.active_support.deprecation = :silence - - # Silence disallowed deprecations. - config.active_support.disallowed_deprecation = :silence - config.action_mailer.delivery_method = :sendmail # Defaults to: # # config.action_mailer.sendmail_settings = { diff --git a/config/environments/test.rb b/config/environments/test.rb index 41413c55ba4..da91752549e 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -50,12 +50,6 @@ Rails.application.configure do config.action_mailer.preview_path = GitlabEdition.path_glob('app/mailers/previews') - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr - - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - config.eager_load = Gitlab::Utils.to_boolean(ENV['GITLAB_TEST_EAGER_LOAD'], default: ENV['CI'].present?) config.cache_store = :null_store |