diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
| commit | 3805d01c9b0ee6681d3e36233a82731200b87d34 (patch) | |
| tree | 0c50c954f6561c64438dc14a7771f9ac4c320003 /railties/lib/rails | |
| parent | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff) | |
| parent | c30f6c270da5cd2ad7605ee9255f052e93609e30 (diff) | |
| download | rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2 rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip | |
resolves merge conflict
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/README | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README index 6966fe987e..fe7013d52d 100644 --- a/railties/lib/rails/generators/rails/app/templates/README +++ b/railties/lib/rails/generators/rails/app/templates/README @@ -158,6 +158,7 @@ The default directory structure of a generated Ruby on Rails application: |-- app | |-- controllers | |-- helpers + | |-- mailers | |-- models | `-- views | `-- layouts @@ -175,7 +176,6 @@ The default directory structure of a generated Ruby on Rails application: | |-- javascripts | `-- stylesheets |-- script - | `-- performance |-- test | |-- fixtures | |-- functional diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt index 0aed79bb70..62aa06dc3e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt @@ -4,5 +4,5 @@ # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information -# (create the session table with "rake db:sessions:create") +# (create the session table with "rails generate session_migration") # <%= app_const %>.config.session_store :active_record_store |