Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack

remove trailing whitespace within actionpack [ci skip]

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 3da2834af0..4b984d0558 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -51,7 +51,7 @@ module AbstractController
         @view_context_class ||= begin
           routes = respond_to?(:_routes) && _routes
           helpers = respond_to?(:_helpers) && _helpers
-          
+
           Class.new(ActionView::Base) do
             if routes
               include routes.url_helpers
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 18ae2c3bfc..d86e8092c4 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -259,7 +259,7 @@ module ActionController #:nodoc:
     # * for other requests - i.e. data formats such as xml, json, csv etc, if
     #   the resource passed to +respond_with+ responds to <code>to_<format></code>,
     #   the method attempts to render the resource in the requested format
-    #   directly, e.g. for an xml request, the response is equivalent to calling 
+    #   directly, e.g. for an xml request, the response is equivalent to calling
     #   <code>render :xml => resource</code>.
     #
     # === Nested resources