Merge branch 'master' into asset-path-helper

Conflicts:
	railties/test/application/configuration_test.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 0a9b9ff4ff..4195106961 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -5,7 +5,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about => :environment do
+task about: :environment do
   puts Rails::Info
 end
 
@@ -26,7 +26,7 @@ namespace :time do
       require 'active_support'
       require 'active_support/time'
       jan_offset = Time.now.beginning_of_year.utc_offset
-      jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset
+      jul_offset = Time.now.beginning_of_year.change(month: 7).utc_offset
       offset = jan_offset < jul_offset ? jan_offset : jul_offset
       build_time_zone_list(:all, offset)
     end