Merge branch 'master' into asset-path-helper

Conflicts:
	railties/test/application/configuration_test.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 231813f774..d8a4f15b4b 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -23,7 +23,7 @@ module Rails
           type = type.to_sym if type
 
           if type && reference?(type)
-            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
             attr_options[:index] = references_index
           end
 
@@ -41,11 +41,11 @@ module Rails
         def parse_type_and_options(type)
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
-            return $1, :limit => $2.to_i
+            return $1, limit: $2.to_i
           when /decimal\{(\d+)[,.-](\d+)\}/
-            return :decimal, :precision => $1.to_i, :scale => $2.to_i
+            return :decimal, precision: $1.to_i, scale: $2.to_i
           when /(references|belongs_to)\{polymorphic\}/
-            return $1, :polymorphic => true
+            return $1, polymorphic: true
           else
             return type, {}
           end