diff options
author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2018-09-23 14:29:35 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-23 14:29:35 +0900 |
commit | 82d184839e573b2085d3ea8007f81ab31827edd0 (patch) | |
tree | 8d37adb501fb5b4b3abe8c17ea7383c7de5feb1b /actionpack/lib/action_dispatch/routing | |
parent | d3b952184d8bdb6154aff1f8bc3eda58046026f6 (diff) | |
parent | 1b86d90136efb98c7b331a84ca163587307a49af (diff) | |
download | rails-82d184839e573b2085d3ea8007f81ab31827edd0.tar.gz rails-82d184839e573b2085d3ea8007f81ab31827edd0.tar.bz2 rails-82d184839e573b2085d3ea8007f81ab31827edd0.zip |
Merge pull request #32971 from y-yagi/use_plus_operator_to_unfreeze_string
Enable `Performance/UnfreezeString` cop
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 07e3be4db8..3f7cf0950d 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -308,7 +308,7 @@ module ActionDispatch def check_controller_and_action(path_params, controller, action) hash = check_part(:controller, controller, path_params, {}) do |part| translate_controller(part) { - message = "'#{part}' is not a supported controller name. This can lead to potential routing problems.".dup + message = +"'#{part}' is not a supported controller name. This can lead to potential routing problems." message << " See https://guides.rubyonrails.org/routing.html#specifying-a-controller-to-use" raise ArgumentError, message diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 07d3a41173..acce8a7ef3 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -245,7 +245,7 @@ module ActionDispatch missing_keys << missing_key } constraints = Hash[@route.requirements.merge(params).sort_by { |k, v| k.to_s }] - message = "No route matches #{constraints.inspect}".dup + message = +"No route matches #{constraints.inspect}" message << ", missing required keys: #{missing_keys.sort.inspect}" raise ActionController::UrlGenerationError, message |