diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-09-03 10:13:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 10:13:30 +0200 |
| commit | 57b95c39869e20ef4db9850b9328e6ea52ca7377 (patch) | |
| tree | 8cd1d61de778ce17e06db8687278f01099b91e1b /actionpack/lib | |
| parent | f2f00ca54a83e86ef845ec9fb3e9e373d367550f (diff) | |
| parent | 7c70430ce063af501154591f114dfc02e559f774 (diff) | |
| download | rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.tar.gz rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.tar.bz2 rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.zip | |
Merge pull request #26374 from kamipo/fix_broken_heredoc_indentation
Fix broken heredoc indentation caused by rubocop auto-correct
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 12 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/nfa/dot.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/stack.rb | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index d84320b713..16ddd3b304 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -663,14 +663,14 @@ module ActionController def non_kwarg_request_warning ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc) - ActionController::TestCase HTTP request methods will accept only - keyword arguments in future Rails versions. + ActionController::TestCase HTTP request methods will accept only + keyword arguments in future Rails versions. - Examples: + Examples: - get :show, params: { id: 1 }, session: { user_id: 1 } - process :update, method: :post, params: { id: 1 } - MSG + get :show, params: { id: 1 }, session: { user_id: 1 } + process :update, method: :post, params: { id: 1 } + MSG end def document_root_element diff --git a/actionpack/lib/action_dispatch/journey/nfa/dot.rb b/actionpack/lib/action_dispatch/journey/nfa/dot.rb index 0cd71b726a..8119e5d9da 100644 --- a/actionpack/lib/action_dispatch/journey/nfa/dot.rb +++ b/actionpack/lib/action_dispatch/journey/nfa/dot.rb @@ -26,7 +26,7 @@ digraph nfa { node [shape = circle]; #{edges.join "\n"} } - eodot + eodot end end end diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb index e49bf54115..466eb8b3f1 100644 --- a/actionpack/lib/action_dispatch/middleware/stack.rb +++ b/actionpack/lib/action_dispatch/middleware/stack.rb @@ -119,7 +119,7 @@ them to actual class references. For example: "#{klass}" => #{converted_klass} - eowarn + eowarn converted_klass else klass |