diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-22 13:27:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 13:27:36 +0900 |
| commit | 222f20eb192e4ec2f19d19cc37dc3ca601d55c8d (patch) | |
| tree | 89b93b757bdf21dee09e2f1a12e0ff68fd157fbc /actionpack | |
| parent | 26749d37fa7ceb4d1a9d98147029145e9aabfa40 (diff) | |
| parent | 999e7ec505d8088b3bd82298750c0f1d0043cede (diff) | |
| download | rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.tar.gz rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.tar.bz2 rails-222f20eb192e4ec2f19d19cc37dc3ca601d55c8d.zip | |
Merge pull request #32681 from bdewater/rubocop-0-54
Rubocop 0.54
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.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/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index acd999444a..8130bfe2e7 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -69,7 +69,7 @@ module ActionDispatch headers["Vary"] = "Accept-Encoding" if gzip_path - return [status, headers, body] + [status, headers, body] ensure request.path_info = path end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index a29a5a04ef..1134279a7f 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -35,7 +35,7 @@ module ActionDispatch if @raise_on_name_error raise else - return [404, { "X-Cascade" => "pass" }, []] + [404, { "X-Cascade" => "pass" }, []] end end |