diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-03 01:56:16 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-03 01:56:16 +0530 |
commit | 3b0bb08699ce409b8213c82956dc34086dcbc8b9 (patch) | |
tree | 34398e3421fcfd86aab2b5fc757175dd2ce7664d /actionpack/lib/action_view/routing_url_for.rb | |
parent | 974467d70d337d4c60414c792e275d367143217b (diff) | |
parent | ee917493e451e552fef18367f8bcba2f36080685 (diff) | |
download | rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.tar.gz rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.tar.bz2 rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_controller/metal/mime_responds.rb
activerecord/lib/active_record/attribute_methods.rb
guides/source/working_with_javascript_in_rails.md
Diffstat (limited to 'actionpack/lib/action_view/routing_url_for.rb')
-rw-r--r-- | actionpack/lib/action_view/routing_url_for.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/routing_url_for.rb b/actionpack/lib/action_view/routing_url_for.rb index d1488e2332..f10e7e88ba 100644 --- a/actionpack/lib/action_view/routing_url_for.rb +++ b/actionpack/lib/action_view/routing_url_for.rb @@ -29,19 +29,19 @@ module ActionView # Controllers passed in using the +:controller+ option will retain their namespace unless it is an absolute one. # # ==== Examples - # <%= url_for(:action => 'index') %> + # <%= url_for(action: 'index') %> # # => /blog/ # - # <%= url_for(:action => 'find', :controller => 'books') %> + # <%= url_for(action: 'find', controller: 'books') %> # # => /books/find # - # <%= url_for(:action => 'login', :controller => 'members', :only_path => false, :protocol => 'https') %> + # <%= url_for(action: 'login', controller: 'members', only_path: false, protocol: 'https') %> # # => https://www.example.com/members/login/ # - # <%= url_for(:action => 'play', :anchor => 'player') %> + # <%= url_for(action: 'play', anchor: 'player') %> # # => /messages/play/#player # - # <%= url_for(:action => 'jump', :anchor => 'tax&ship') %> + # <%= url_for(action: 'jump', anchor: 'tax&ship') %> # # => /testing/jump/#tax&ship # # <%= url_for(Workshop.new) %> @@ -66,11 +66,11 @@ module ActionView # # if request.env["HTTP_REFERER"] is not set or is blank # # => javascript:history.back() # - # <%= url_for(:action => 'index', :controller => 'users') %> + # <%= url_for(action: 'index', controller: 'users') %> # # Assuming an "admin" namespace # # => /admin/users # - # <%= url_for(:action => 'index', :controller => '/users') %> + # <%= url_for(action: 'index', controller: '/users') %> # # Specify absolute path with beginning slash # # => /users def url_for(options = nil) |