Permalink
Browse files

Merge pull request #8 from marsz/master

Upgrade to rails 3.2.9
  • Loading branch information...
2 parents 3dcfce8 + 6c92e3e commit 2974e3e883ed5d4b81e22c52ed9cfa32df6d9103 @xdite committed Jan 1, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −1 bootstrapers.gemspec
  2. +1 −0 lib/bootstrappers/app_builder.rb
  3. +1 −0 templates/config_yml.erb
View
@@ -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
@@ -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
View
@@ -7,6 +7,7 @@ defaults: &defaults
- ""
google_analytics_key: ""
default_logo_url: "/logo.png"
+ email_sender: ""
development:
<<: *defaults

0 comments on commit 2974e3e

Please sign in to comment.