diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-12-20 12:33:46 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-12-20 12:33:46 +0000 |
| commit | b691d62be9357fddeca6a2ab247a423d0a4ce7ab (patch) | |
| tree | b2f20a95f16e19b19484ad411ed5742c593fa0ea | |
| parent | cf8621a3e9676f0c62d84dc42797e75bc6ab1a1d (diff) | |
| parent | bd3fc6d4742056d3858a9bc35a86386d62ede15d (diff) | |
| download | rails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.tar.gz rails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.tar.bz2 rails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.zip | |
Merge branch 'master' of github.com:rails/docrails
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/fixtures.yml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 7f349f2741..8edea0f52b 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -49,7 +49,7 @@ module AbstractController # instance methods on that abstract class. Public instance methods of # a controller would normally be considered action methods, so methods # declared on abstract classes are being removed. - # (ActionController::Metal and ActionController::Base are defined as abstract) + # (<tt>ActionController::Metal</tt> and ActionController::Base are defined as abstract) def internal_methods controller = self @@ -80,7 +80,7 @@ module AbstractController # action_methods are cached and there is sometimes need to refresh # them. ::clear_action_methods! allows you to do that, so next time - # you run action_methods, they will be recalculated + # you run action_methods, they will be recalculated. def clear_action_methods! @action_methods = nil end diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 8e040bb465..f6a93a8940 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -166,7 +166,7 @@ module ActionController alias :response_code :status # :nodoc: - # Basic url_for that can be overridden for more robust functionality + # Basic url_for that can be overridden for more robust functionality. def url_for(string) string end diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml index 50ca61a35b..2656767eb4 100644 --- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml +++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml @@ -17,7 +17,7 @@ <% end -%> <% else -%> -# This model initially had no columns defined. If you add columns to the +# This model initially had no columns defined. If you add columns to the # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # @@ -25,5 +25,5 @@ one: {} # column: value # two: {} -# column: value +# column: value <% end -%> |