Merge pull request xdite#8 from marsz/master

Upgrade to rails 3.2.9
arrmac · Jan 1, 2013 · 2974e3e · 2974e3e
2 parents 3dcfce8 + 6c92e3e
commit 2974e3e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/bootstrapers.gemspec b/bootstrapers.gemspec
@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'rails', '3.2.8'
+  gem.add_dependency 'rails', '3.2.9'
   gem.add_dependency 'bundler', '>= 1.1'
 end
diff --git a/lib/bootstrappers/app_builder.rb b/lib/bootstrappers/app_builder.rb
@@ -59,6 +59,7 @@ def build_settings_from_config
 
       template 'setting.rb', 'app/models/setting.rb',:force => true
       template 'config_yml.erb', 'config/config.yml',:force => true
+      template 'config_yml.erb', 'config/config.yml.example',:force => true
     end
 
     def create_initializers

diff --git a/templates/config_yml.erb b/templates/config_yml.erb
@@ -7,6 +7,7 @@ defaults: &defaults
     - ""
   google_analytics_key: ""
   default_logo_url: "/logo.png"
+  email_sender: ""
 
 development:
   <<: *defaults