From d5a72f96304f4cf8de92d3a5080f5c94d042ff63 Mon Sep 17 00:00:00 2001 From: Nathan Wilson Date: Sun, 17 May 2020 08:18:19 -0400 Subject: [PATCH 1/3] Update name of explicitly disabled cop --- app/extensions/string_extensions.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/extensions/string_extensions.rb b/app/extensions/string_extensions.rb index 0bab43abae..6760736e81 100644 --- a/app/extensions/string_extensions.rb +++ b/app/extensions/string_extensions.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # # = Extensions to String # == Class Methods @@ -36,7 +37,7 @@ class String # :stopdoc: # Disable cop in order to make code more readable - # rubocop:disable Layout/AlignHash + # rubocop:disable Layout/HashAlignment unless defined? UTF_TO_ASCII # This should cover most everything we'll see, at least all the European # characters and accents -- it covers HTML codes  to Ɛ. @@ -365,7 +366,7 @@ class String "nbsp" => " " }.freeze end - # rubocop:enable Layout/AlignHash + # rubocop:enable Layout/HashAlignment # :startdoc: # This should safely match anything that could possibly be interpreted as From 3eeb5acff15e6171b2ff462a41ccd583d96bd0fe Mon Sep 17 00:00:00 2001 From: Nathan Wilson Date: Sun, 17 May 2020 12:54:53 +0000 Subject: [PATCH 2/3] Cleanup emacs cruft --- app/extensions/string_extensions.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/extensions/string_extensions.rb b/app/extensions/string_extensions.rb index 6760736e81..fdcc9c0083 100644 --- a/app/extensions/string_extensions.rb +++ b/app/extensions/string_extensions.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # = Extensions to String # == Class Methods From 09fbfefccfb7c3d08156a2ac91fc27b4a6659750 Mon Sep 17 00:00:00 2001 From: Nathan Wilson Date: Sun, 17 May 2020 13:01:41 +0000 Subject: [PATCH 3/3] Allow both local and CodeClimate to pass --- app/extensions/string_extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/extensions/string_extensions.rb b/app/extensions/string_extensions.rb index fdcc9c0083..eaa32e463e 100644 --- a/app/extensions/string_extensions.rb +++ b/app/extensions/string_extensions.rb @@ -36,7 +36,7 @@ class String # :stopdoc: # Disable cop in order to make code more readable - # rubocop:disable Layout/HashAlignment + # rubocop:disable Layout/HashAlignment,Layout/AlignHash unless defined? UTF_TO_ASCII # This should cover most everything we'll see, at least all the European # characters and accents -- it covers HTML codes  to Ɛ. @@ -365,7 +365,7 @@ class String "nbsp" => " " }.freeze end - # rubocop:enable Layout/HashAlignment + # rubocop:enable Layout/HashAlignment,Layout/AlignHash # :startdoc: # This should safely match anything that could possibly be interpreted as