diff options
4 files changed, 15 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb index 5115c2fadf..1ecee811fb 100644 --- a/actionpack/lib/action_controller/metal/flash.rb +++ b/actionpack/lib/action_controller/metal/flash.rb @@ -33,10 +33,12 @@ module ActionController #:nodoc: types.each do |type| next if _flash_types.include?(type) - define_method(type) do - request.flash[type] + if respond_to? :helper_method + define_method(type) do + request.flash[type] + end + helper_method type end - helper_method type self._flash_types += [type] end diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index 34bc2c0caa..a4330897cf 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -342,6 +342,14 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest end end + def test_flash_usable_in_metal_without_helper + assert_nothing_raised do + Class.new ActionController::Metal do + include ActionController::Flash + end + end + end + private # Overwrite get to send SessionSecret in env hash diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index 9aabde676a..9ff63c6e10 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -10,6 +10,7 @@ module ActiveRecord # application's database configuration hash or url string. class DatabaseConfigurations attr_reader :configurations + delegate :any?, to: :configurations def initialize(configurations = {}) @configurations = build_configs(configurations) diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb index ad6a9c6146..f36fef6cc9 100644 --- a/activesupport/lib/active_support/core_ext/object/blank.rb +++ b/activesupport/lib/active_support/core_ext/object/blank.rb @@ -4,7 +4,7 @@ require "concurrent/map" class Object # An object is blank if it's false, empty, or a whitespace string. - # For example, +false+, '', ' ', +nil+, [], and {} are all blank. + # For example, +nil+, '', ' ', [], {}, and +false+ are all blank. # # This simplifies # |