diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-15 21:20:28 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-15 21:20:28 +0530 |
commit | 5cc178a291a363a4c6b15fd826a7551a23a87786 (patch) | |
tree | 57722307b666c4f69d2d6c60e5dbca242b898936 /railties | |
parent | 8f8397e0a4ea2bbc27d4bba60088286217314807 (diff) | |
parent | 561e5ab82eb24335f76961d437a16f09b4a15474 (diff) | |
download | rails-5cc178a291a363a4c6b15fd826a7551a23a87786.tar.gz rails-5cc178a291a363a4c6b15fd826a7551a23a87786.tar.bz2 rails-5cc178a291a363a4c6b15fd826a7551a23a87786.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
railties/lib/rails/info_controller.rb
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/generators/rails/migration/USAGE | 9 | ||||
-rw-r--r-- | railties/lib/rails/info_controller.rb | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/rails/migration/USAGE b/railties/lib/rails/generators/rails/migration/USAGE index af74963b01..f340ed97f2 100644 --- a/railties/lib/rails/generators/rails/migration/USAGE +++ b/railties/lib/rails/generators/rails/migration/USAGE @@ -15,15 +15,8 @@ Example: `rails generate migration AddTitleBodyToPost title:string body:text published:boolean` - This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with - this in the Up migration: + This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with this in the Change migration: add_column :posts, :title, :string add_column :posts, :body, :text add_column :posts, :published, :boolean - - And this in the Down migration: - - remove_column :posts, :published - remove_column :posts, :body - remove_column :posts, :title diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb index fe1e25d88c..e296637f39 100644 --- a/railties/lib/rails/info_controller.rb +++ b/railties/lib/rails/info_controller.rb @@ -1,6 +1,6 @@ require 'action_dispatch/routing/inspector' -class Rails::InfoController < ActionController::Base +class Rails::InfoController < ActionController::Base # :nodoc: self.view_paths = File.expand_path('../templates', __FILE__) layout 'application' |