diff options
author | Matthew Draper <matthew@trebex.net> | 2017-07-17 17:36:18 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-17 17:36:18 +0930 |
commit | fbade51248ea48db87703ba7418badbd3ed85e36 (patch) | |
tree | 57b9b95a9eef8fa397532992fc277f31019d2815 /activesupport | |
parent | a0ff5b57246f0b1439dc9b5ffbdd880e70fab93d (diff) | |
parent | 4183d5dfa1d6d651232a4db44a1fcf71d220af4e (diff) | |
download | rails-fbade51248ea48db87703ba7418badbd3ed85e36.tar.gz rails-fbade51248ea48db87703ba7418badbd3ed85e36.tar.bz2 rails-fbade51248ea48db87703ba7418badbd3ed85e36.zip |
Merge pull request #29810 from kamipo/add_first_parameter_indentation
Enable `Layout/FirstParameterIndentation` cop
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/inflector/transliterate.rb | 7 | ||||
-rw-r--r-- | activesupport/test/clean_backtrace_test.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb index 246fe7a916..aa7b21734e 100644 --- a/activesupport/lib/active_support/inflector/transliterate.rb +++ b/activesupport/lib/active_support/inflector/transliterate.rb @@ -61,9 +61,10 @@ module ActiveSupport def transliterate(string, replacement = "?".freeze) raise ArgumentError, "Can only transliterate strings. Received #{string.class.name}" unless string.is_a?(String) - I18n.transliterate(ActiveSupport::Multibyte::Unicode.normalize( - ActiveSupport::Multibyte::Unicode.tidy_bytes(string), :c), - replacement: replacement) + I18n.transliterate( + ActiveSupport::Multibyte::Unicode.normalize( + ActiveSupport::Multibyte::Unicode.tidy_bytes(string), :c), + replacement: replacement) end # Replaces special characters in a string so that it may be used as part of diff --git a/activesupport/test/clean_backtrace_test.rb b/activesupport/test/clean_backtrace_test.rb index e9361ecd26..1b44c7c9bf 100644 --- a/activesupport/test/clean_backtrace_test.rb +++ b/activesupport/test/clean_backtrace_test.rb @@ -10,8 +10,8 @@ class BacktraceCleanerFilterTest < ActiveSupport::TestCase test "backtrace should filter all lines in a backtrace, removing prefixes" do assert_equal \ - ["/my/class.rb", "/my/module.rb"], - @bc.clean(["/my/prefix/my/class.rb", "/my/prefix/my/module.rb"]) + ["/my/class.rb", "/my/module.rb"], + @bc.clean(["/my/prefix/my/class.rb", "/my/prefix/my/module.rb"]) end test "backtrace cleaner should allow removing filters" do |