Skip to content

Commit 15576dd

Browse files
authored
Merge pull request rails#46800 from the-spectator/prefer_local_env
Prefer using new Rails.env.local?
2 parents 6d581c4 + c312bb7 commit 15576dd

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

actionpack/lib/action_controller/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Railtie < Rails::Railtie # :nodoc:
4242
action_on_unpermitted_parameters = options.action_on_unpermitted_parameters
4343

4444
if action_on_unpermitted_parameters.nil?
45-
action_on_unpermitted_parameters = (Rails.env.test? || Rails.env.development?) ? :log : false
45+
action_on_unpermitted_parameters = Rails.env.local? ? :log : false
4646
end
4747

4848
ActionController::Parameters.action_on_unpermitted_parameters = action_on_unpermitted_parameters

activerecord/lib/active_record/migration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def initialize(message = nil, pending_migrations: nil)
154154
private
155155
def detailed_migration_message(pending_migrations)
156156
message = "Migrations are pending. To resolve this issue, run:\n\n bin/rails db:migrate"
157-
message += " RAILS_ENV=#{::Rails.env}" if defined?(Rails.env) && !(Rails.env.development? || Rails.env.test?)
157+
message += " RAILS_ENV=#{::Rails.env}" if defined?(Rails.env) && !Rails.env.local?
158158
message += "\n\n"
159159

160160
message += "You have #{pending_migrations.size} pending #{pending_migrations.size > 1 ? 'migrations:' : 'migration:'}\n\n"

railties/lib/rails/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def secrets
471471
# then +credentials.secret_key_base+, and finally +secrets.secret_key_base+. For most applications,
472472
# the correct place to store it is in the encrypted credentials file.
473473
def secret_key_base
474-
if Rails.env.development? || Rails.env.test? || ENV["SECRET_KEY_BASE_DUMMY"]
474+
if Rails.env.local? || ENV["SECRET_KEY_BASE_DUMMY"]
475475
secrets.secret_key_base ||= generate_development_secret
476476
else
477477
validate_secret_key_base(

railties/lib/rails/application/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def load_defaults(target_version)
280280
self.add_autoload_paths_to_load_path = false
281281
self.precompile_filter_parameters = true
282282

283-
if Rails.env.development? || Rails.env.test?
283+
if Rails.env.local?
284284
self.log_file_size = 100 * 1024 * 1024
285285
end
286286

railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_1.rb.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
# `config.load_defaults 7.1` does not set this value for environments other than
105105
# development and test.
106106
#
107-
# if Rails.env.development? || Rails.env.test?
107+
# if Rails.env.local?
108108
# Rails.application.config.log_file_size = 100 * 1024 * 1024
109109
# end
110110

0 commit comments

Comments
 (0)