aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactionpack/lib/action_controller/base.rb14
-rw-r--r--railties/environments/environment.rb3
2 files changed, 2 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index f62a5502b4..71df8c23c4 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -433,20 +433,6 @@ module ActionController #:nodoc:
#
# This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
# would have slashed-off the path components are the changed action.
- #
- # Instead of passing an options hash, you can also pass a method reference in the form of a symbol. Consider this example:
- #
- # class WeblogController < ActionController::Base
- # def update
- # # do some update
- # redirect_to :dashboard_url
- # end
- #
- # protected
- # def dashboard_url
- # url_for :controller => (@project.active? ? "project" : "account"), :action => "dashboard"
- # end
- # end
def url_for(options = {}, *parameters_for_method_reference) #:doc:
case options
when String then options
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index fc66d4ae44..c1da6f5482 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -14,7 +14,8 @@ Rails::Initializer.run do |config|
# Add additional load paths for your own custom dirs
# config.load_paths += %W( #{RAILS_ROOT}/app/services #{RAILS_ROOT}/app/services )
- # Force all environments to use the same logger level
+ # Force all environments to use the same logger level
+ # (by default production uses INFO, the others DEBUG)
# config.log_level = Logger::DEBUG
# See Rails::Configuration for more options