diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-07 11:48:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 11:48:29 +0200 |
| commit | fb98d2e57162876c0e1823a5357bc44a932d08b9 (patch) | |
| tree | 2c3225f7698ef3f7b2556510136c64a58ecf7355 /actionpack/lib | |
| parent | 0d12708f3967fe93c172b30bd3e98e4433761c36 (diff) | |
| parent | 762e3f05f3d372cb32570db0deeef27232c4dd00 (diff) | |
| download | rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2 rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip | |
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/parser.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/journey/parser.rb b/actionpack/lib/action_dispatch/journey/parser.rb index 38984edd3b..91fef7e96f 100644 --- a/actionpack/lib/action_dispatch/journey/parser.rb +++ b/actionpack/lib/action_dispatch/journey/parser.rb @@ -6,7 +6,6 @@ require "racc/parser.rb" - require "action_dispatch/journey/parser_extras" module ActionDispatch module Journey diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb index 3e2b21ac72..eb96466aa5 100644 --- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb +++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb @@ -134,7 +134,6 @@ module ActionDispatch opts end - %w(edit new).each do |action| module_eval <<-EOT, __FILE__, __LINE__ + 1 def #{action}_polymorphic_url(record_or_hash, options = {}) @@ -211,7 +210,6 @@ module ActionDispatch method, args = builder.handle_model record_or_hash_or_array end - if options.empty? recipient.send(method, *args) else |