Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.
2023-06-05 13:25:22 +02:00
parent ee771f5bad 00c222377d
commit c22fc2fa80
33 changed files with 1640 additions and 820 deletions
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true

-# rubocop:disable Metrics/ModuleLength
-
 module LanguagesHelper
  ISO_639_1 = {
    aa: ['Afar', 'Afaraf'].freeze,