aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
commit6338e1e68dfbe77c39eaaa17bb4950ef7db73704 (patch)
tree6bca387ebcc859a5f277a65f268cd885c7e1b00c /railties/lib/rails/application.rb
parent1974911b8d5780ec16e138027a0099bd8482f88f (diff)
parent5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3 (diff)
downloadrails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.gz
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.bz2
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.zip
Merge pull request #7941 from robin850/master
Use 1.9 Hash syntax in railties
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0a717c76b3..eff5bbbdd6 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -71,7 +71,7 @@ module Rails
attr_reader :reloaders
attr_writer :queue
- delegate :default_url_options, :default_url_options=, :to => :routes
+ delegate :default_url_options, :default_url_options=, to: :routes
def initialize
super
@@ -106,7 +106,7 @@ module Rails
def key_generator
# number of iterations selected based on consultation with the google security
# team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
- @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, :iterations=>1000)
+ @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, iterations: 1000)
end
# Stores some of the Rails initial environment parameters which
@@ -296,9 +296,9 @@ module Rails
if rack_cache == true
rack_cache = {
- :metastore => "rails:/",
- :entitystore => "rails:/",
- :verbose => false
+ metastore: "rails:/",
+ entitystore: "rails:/",
+ verbose: false
}
end