diff options
| -rw-r--r-- | activesupport/test/inflector_test_cases.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails.rb | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb index f0beb82ca6..86c5e1f135 100644 --- a/activesupport/test/inflector_test_cases.rb +++ b/activesupport/test/inflector_test_cases.rb @@ -224,6 +224,7 @@ module InflectorTestCases "sgt. pepper's" => "Sgt. Pepper's", "i've just seen a face" => "I've Just Seen A Face", "maybe you'll be there" => "Maybe You'll Be There", + "¿por qué?" => '¿Por Qué?', "Fred’s" => "Fred’s", "Fred`s" => "Fred`s" } diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 6b431d3ee3..945063e55c 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -25,11 +25,11 @@ module Rails class << self def application - @@application ||= nil + @application ||= nil end def application=(application) - @@application = application + @application = application end # The Configuration instance used to configure the Rails environment @@ -46,15 +46,15 @@ module Rails end def logger - @@logger ||= nil + @logger ||= nil end def logger=(logger) - @@logger = logger + @logger = logger end def backtrace_cleaner - @@backtrace_cleaner ||= begin + @backtrace_cleaner ||= begin # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded require 'rails/backtrace_cleaner' Rails::BacktraceCleaner.new @@ -74,11 +74,11 @@ module Rails end def cache - @@cache ||= nil + @cache ||= nil end def cache=(cache) - @@cache = cache + @cache = cache end # Returns all rails groups for loading based on: |