From b749fbb71d162bccee9d3e4c5059bd08610a7c15 Mon Sep 17 00:00:00 2001 From: ConnorSheremeta Date: Wed, 21 Aug 2024 09:32:18 -0600 Subject: [PATCH 1/2] bring in and enforce inclusive language cops --- .rubocop.yml | 4 ++++ config/initializers/comfortable_mexican_sofa.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9566cc5a..31cf08d4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,6 +5,10 @@ require: - rubocop-rails - standard +# TODO: update reference once merged. +inherit_from: + - https://raw.githubusercontent.com/ualbertalib/library_applications_development_inclusive_language/cds/initial-commit/inclusive_language_rubocop.yml + inherit_gem: standard: config/base.yml diff --git a/config/initializers/comfortable_mexican_sofa.rb b/config/initializers/comfortable_mexican_sofa.rb index 61965ba9..c2a82460 100644 --- a/config/initializers/comfortable_mexican_sofa.rb +++ b/config/initializers/comfortable_mexican_sofa.rb @@ -59,12 +59,12 @@ # <% User.delete_all %> but if you really want to allow it... # config.allow_erb = false - # Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default + # Allowlist of all helper methods that can be used via {{cms:helper}} tag. By default # all helpers are allowed except `eval`, `send`, `call` and few others. Empty array # will prevent rendering of all helpers. # config.allowed_helpers = nil - # Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials + # Allowlist of partials paths that can be used via {{cms:partial}} tag. All partials # are accessible by default. Empty array will prevent rendering of all partials. # config.allowed_partials = nil From 7d4798f36e5307d105b28f66ea5c32274f743fd2 Mon Sep 17 00:00:00 2001 From: ConnorSheremeta Date: Fri, 23 Aug 2024 15:58:28 -0600 Subject: [PATCH 2/2] update reference --- .rubocop.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 31cf08d4..647e859c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,9 +5,8 @@ require: - rubocop-rails - standard -# TODO: update reference once merged. inherit_from: - - https://raw.githubusercontent.com/ualbertalib/library_applications_development_inclusive_language/cds/initial-commit/inclusive_language_rubocop.yml + - https://raw.githubusercontent.com/ualbertalib/library_applications_development_inclusive_language/main/inclusive_language_rubocop.yml inherit_gem: standard: config/base.yml