normalizes indentation and whitespace across the project

1 files changed, 47 insertions, 47 deletions

diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index d99486f29b..41b166b346 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -54,37 +54,37 @@ module ActionController
 
     private
 
-    def _render_in_priorities(options)
-      RENDER_FORMATS_IN_PRIORITY.each do |format|
-        return options[format] if options.key?(format)
-      end
+      def _render_in_priorities(options)
+        RENDER_FORMATS_IN_PRIORITY.each do |format|
+          return options[format] if options.key?(format)
+        end
 
-      nil
-    end
+        nil
+      end
 
-    def _set_html_content_type
-      self.content_type = Mime[:html].to_s
-    end
+      def _set_html_content_type
+        self.content_type = Mime[:html].to_s
+      end
 
-    def _set_rendered_content_type(format)
-      unless response.content_type
-        self.content_type = format.to_s
+      def _set_rendered_content_type(format)
+        unless response.content_type
+          self.content_type = format.to_s
+        end
       end
-    end
 
     # Normalize arguments by catching blocks and setting them on :update.
-    def _normalize_args(action=nil, options={}, &blk) #:nodoc:
-      options = super
-      options[:update] = blk if block_given?
-      options
-    end
+      def _normalize_args(action=nil, options={}, &blk) #:nodoc:
+        options = super
+        options[:update] = blk if block_given?
+        options
+      end
 
     # Normalize both text and status options.
-    def _normalize_options(options) #:nodoc:
-      _normalize_text(options)
+      def _normalize_options(options) #:nodoc:
+        _normalize_text(options)
 
-      if options[:text]
-        ActiveSupport::Deprecation.warn <<-WARNING.squish
+        if options[:text]
+          ActiveSupport::Deprecation.warn <<-WARNING.squish
           `render :text` is deprecated because it does not actually render a
           `text/plain` response. Switch to `render plain: 'plain text'` to
           render as `text/plain`, `render html: '<strong>HTML</strong>'` to
@@ -92,41 +92,41 @@ module ActionController
           behavior and render with the default Content-Type, which is
           `text/plain`.
         WARNING
-      end
+        end
 
-      if options[:html]
-        options[:html] = ERB::Util.html_escape(options[:html])
-      end
+        if options[:html]
+          options[:html] = ERB::Util.html_escape(options[:html])
+        end
 
-      if options.delete(:nothing)
-        ActiveSupport::Deprecation.warn("`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body.")
-        options[:body] = nil
-      end
+        if options.delete(:nothing)
+          ActiveSupport::Deprecation.warn("`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body.")
+          options[:body] = nil
+        end
 
-      if options[:status]
-        options[:status] = Rack::Utils.status_code(options[:status])
-      end
+        if options[:status]
+          options[:status] = Rack::Utils.status_code(options[:status])
+        end
 
-      super
-    end
+        super
+      end
 
-    def _normalize_text(options)
-      RENDER_FORMATS_IN_PRIORITY.each do |format|
-        if options.key?(format) && options[format].respond_to?(:to_text)
-          options[format] = options[format].to_text
+      def _normalize_text(options)
+        RENDER_FORMATS_IN_PRIORITY.each do |format|
+          if options.key?(format) && options[format].respond_to?(:to_text)
+            options[format] = options[format].to_text
+          end
         end
       end
-    end
 
     # Process controller specific options, as status, content-type and location.
-    def _process_options(options) #:nodoc:
-      status, content_type, location = options.values_at(:status, :content_type, :location)
+      def _process_options(options) #:nodoc:
+        status, content_type, location = options.values_at(:status, :content_type, :location)
 
-      self.status = status if status
-      self.content_type = content_type if content_type
-      self.headers["Location"] = url_for(location) if location
+        self.status = status if status
+        self.content_type = content_type if content_type
+        self.headers["Location"] = url_for(location) if location
 
-      super
-    end
+        super
+      end
   end
 end