diff options
author | Xavier Noria <fxn@hashref.com> | 2016-09-14 11:36:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-14 11:36:12 +0200 |
commit | 0fe76197d2622674e1796a9a000995a7a1f6622b (patch) | |
tree | ad2e1380ede0a1789c7c1a7bffb1f43b465c4105 /actionpack/lib/action_controller/metal/rendering.rb | |
parent | 92703a9ea5d8b96f30e0b706b801c9185ef14f0e (diff) | |
parent | 3464cd5c288323ca115a4929d1e6b435c4afc8d4 (diff) | |
download | rails-0fe76197d2622674e1796a9a000995a7a1f6622b.tar.gz rails-0fe76197d2622674e1796a9a000995a7a1f6622b.tar.bz2 rails-0fe76197d2622674e1796a9a000995a7a1f6622b.zip |
Merge pull request #26489 from kamipo/fix_broken_comments_indentation
Fix broken comments indentation caused by rubocop auto-correct [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index ac17d61b96..46ddf48926 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -72,14 +72,14 @@ module ActionController end end - # Normalize arguments by catching blocks and setting them on :update. + # 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 - # Normalize both text and status options. + # Normalize both text and status options. def _normalize_options(options) #:nodoc: _normalize_text(options) @@ -118,7 +118,7 @@ module ActionController end end - # Process controller specific options, as status, content-type and location. + # 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) |