Skip to content

Commit

Permalink
see CHANGELOG, bump version to 2.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielKehoe committed Aug 30, 2012
1 parent 08a1822 commit f11529e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.textile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
h1. CHANGELOG

h2. 2.2.6 August 30, 2012

* fix 'prelaunch' recipe to correct application name in the routes.rb file

h2. 2.2.5 August 29, 2012

* fix 'frontend' recipe to remove application.css after twitter-bootstrap-rails creates it
Expand Down
3 changes: 3 additions & 0 deletions lib/rails_wizard/diagnostics.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ module Diagnostics
# :ban_spiders
# :jsruntime
# :rvmrc
# :prelaunch_branch
# :main_branch

@@prefs = []
@@prefs << {:railsapps=>"rails-prelaunch-signup", :database=>"sqlite", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"mandrill", :authentication=>"devise", :devise_modules=>"confirmable", :authorization=>"cancan", :starter_app=>"admin_app", :form_builder=>"simple_form"}
@@prefs << {:railsapps=>"rails3-bootstrap-devise-cancan", :database=>"sqlite", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"gmail", :authentication=>"devise", :devise_modules=>"default", :authorization=>"cancan", :starter_app=>"admin_app", :form_builder=>"none"}
@@prefs << {:railsapps=>"rails3-devise-rspec-cucumber", :database=>"sqlite", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"none", :email=>"gmail", :authentication=>"devise", :devise_modules=>"default", :authorization=>"none", :starter_app=>"users_app", :form_builder=>"none"}
@@prefs << {:railsapps=>"rails3-mongoid-devise", :database=>'mongodb', :orm=>'mongoid', :templates=>'erb', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'gmail', :authentication=>'devise', :devise_modules=>'default', :authorization=>'none', :starter_app=>'users_app', :form_builder=>'none'}
Expand Down
2 changes: 2 additions & 0 deletions recipes/prelaunch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
# >-------------------------------[ Routes ]--------------------------------<

copy_from_repo 'config/routes.rb', :repo => repo
### CORRECT APPLICATION NAME ###
gsub_file 'config/routes.rb', /^.*.routes.draw do/, "#{app_const}.routes.draw do"

# >-------------------------------[ Assets ]--------------------------------<

Expand Down
2 changes: 2 additions & 0 deletions templates/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ redacted_prefs.delete(:templates)
redacted_prefs.delete(:ban_spiders)
redacted_prefs.delete(:jsruntime)
redacted_prefs.delete(:rvmrc)
redacted_prefs.delete(:prelaunch_branch)
redacted_prefs.delete(:main_branch)

if diagnostics_prefs.include? redacted_prefs
diagnostics[:prefs] = 'success'
Expand Down
2 changes: 1 addition & 1 deletion version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RailsWizard
VERSION = "2.2.5"
VERSION = "2.2.6"
end

0 comments on commit f11529e

Please sign in to comment.