aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-17 15:38:55 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-17 15:46:33 -0300
commit31fb1ef536db5c593613e6c34dd6546000066f67 (patch)
treed153f51f698a1913725e4ab17068625490f755f5 /railties/lib/rails
parent1b8529ec028d5189d3c104fcf470824d3ada7ff2 (diff)
downloadrails-31fb1ef536db5c593613e6c34dd6546000066f67.tar.gz
rails-31fb1ef536db5c593613e6c34dd6546000066f67.tar.bz2
rails-31fb1ef536db5c593613e6c34dd6546000066f67.zip
New applications should be created with json serializer
The fix introduced at 75ba7425f6d235f254c00a45a58f42e88f80301a were missing this case. To fix the original issue mentioned at that commit the correct is to remove update_config_files from the command list since we should not run both config_files command when creating a new application. Tests were added to make sure everything is working fine.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 1f86a30006..188e62b6c8 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -194,9 +194,14 @@ module Rails
build(:bin)
end
+ def create_config_files
+ build(:config)
+ end
+
def update_config_files
build(:config_when_updating)
end
+ remove_task :update_config_files
def create_boot_file
template "config/boot.rb"