diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-07-11 17:36:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-11 17:36:43 -0400 |
commit | cfb1e4dfd8813d3d5c75a15a750b3c53eebdea65 (patch) | |
tree | 387edb2a4b1bdcdb5271d285c6fdf106313521a1 /actionview | |
parent | f3e8d599a3ce4bdc6cf38ccd2e78c14cb84e28c5 (diff) | |
parent | 2653765144976d8f085d3ac473926b3f97a71d6b (diff) | |
download | rails-cfb1e4dfd8813d3d5c75a15a750b3c53eebdea65.tar.gz rails-cfb1e4dfd8813d3d5c75a15a750b3c53eebdea65.tar.bz2 rails-cfb1e4dfd8813d3d5c75a15a750b3c53eebdea65.zip |
Merge pull request #29748 from koic/enable_layout_empty_line_after_magic_comment
Enable Layout/EmptyLineAfterMagicComment cop
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/log_subscriber.rb | 1 | ||||
-rw-r--r-- | actionview/lib/action_view/template.rb | 1 | ||||
-rw-r--r-- | actionview/test/template/template_test.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb index c8623f1e9f..d4ac77e10f 100644 --- a/actionview/lib/action_view/log_subscriber.rb +++ b/actionview/lib/action_view/log_subscriber.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support/log_subscriber" module ActionView diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index 80b294dc3d..e53c8356af 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require "active_support/core_ext/object/try" require "active_support/core_ext/kernel/singleton_class" require "thread" diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb index dd131f0246..d3c08634bc 100644 --- a/actionview/test/template/template_test.rb +++ b/actionview/test/template/template_test.rb @@ -1,4 +1,5 @@ # encoding: US-ASCII + require "abstract_unit" require "logger" |