AO3-6565 Resolve merge conflcits

.erb-lint.yml

@@ -15,8 +15,6 @@ linters:
     rubocop_config:
       inherit_from:
         - .rubocop.yml
-        # Uncomment the following line to ignore known issues
-        # - .rubocop_todo_erb.yml
       Layout/ArgumentAlignment:
         EnforcedStyle: with_fixed_indentation
       Layout/InitialIndentation:

.gitattributes

@@ -1,2 +1,6 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
+# Bash scripts needs to have LF line endings, even on Windows
+*.sh text eol=lf
+# /usr/local/bin/ruby: warning: shebang line ending with \r may cause problems
+/bin/* text eol=lf

.github/workflows/automated-tests.yml

@@ -54,16 +54,22 @@ jobs:
             arguments: db:otwseed
           - command: rspec
             arguments: spec/controllers
+            imagemagick: true
           - command: rspec
             arguments: spec/models
+            imagemagick: true
           - command: rspec
             arguments: --exclude-pattern 'spec/{controllers,models}/**/*.rb'
+            imagemagick: true
           - command: cucumber
             arguments: features/admins
+            imagemagick: true
           - command: cucumber
             arguments: features/bookmarks
+            imagemagick: true
           - command: cucumber
             arguments: features/collections
+            imagemagick: true
           - command: cucumber
             arguments: features/comments_and_kudos
           - command: cucumber
@@ -73,8 +79,10 @@ jobs:
             vcr: true
           - command: cucumber
             arguments: features/other_a
+            imagemagick: true
           - command: cucumber
             arguments: features/other_b
+            imagemagick: true
           - command: cucumber
             arguments: features/prompt_memes_a
           - command: cucumber
@@ -92,6 +100,7 @@ jobs:
           - command: cucumber
             arguments: features/works
             ebook: true
+            imagemagick: true
 
     steps:
       - name: Check out code
@@ -129,6 +138,10 @@ jobs:
           restore-keys: |
             cassette-library-${{ hashFiles(matrix.tests.arguments) }}-
 
+      - name: Install imagemagick for image processing
+        if: ${{ matrix.tests.imagemagick }}
+        run: sudo apt-get install -y imagemagick
+
       - name: Set up Ruby and run bundle install
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/phrase-export-checks.yml

@@ -0,0 +1,84 @@
+name: Check Phrase exports
+on:
+  pull_request:
+    branches:
+      - master
+      - main
+  workflow_dispatch:
+
+jobs:
+  en-keys-to-remove:
+    if: github.head_ref == 'phrase-translations'
+    runs-on: ubuntu-latest
+    name: Check for outdated English keys in Phrase
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby and run bundle install
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Run i18n-tasks missing (diff mode)
+        run: bundle exec i18n-tasks missing -t diff -f keys en | bundle exec i18n-tasks tree-mv -f keys "en.{*}" "\1" > en-keys-to-remove.txt
+
+      - name: Check that all keys exported from Phrase exist in English
+        run: "! test -s en-keys-to-remove.txt"
+
+      - name: Upload list of English keys that should be removed from Phrase
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: en-keys-to-remove
+          path: en-keys-to-remove.txt
+
+  unused-keys:
+    if: github.head_ref == 'phrase-translations'
+    runs-on: ubuntu-latest
+    needs: en-keys-to-remove
+    name: Check unused keys for all locales
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby and run bundle install
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Run i18n-tasks unused
+        run: bundle exec i18n-tasks unused -f keys > unused-keys.txt
+
+      - name: Upload list of unused locale keys
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: unused-keys
+          path: unused-keys.txt
+
+  inconsistent-interpolations:
+    if: github.head_ref == 'phrase-translations'
+    runs-on: ubuntu-latest
+    name: Check consistent interpolations for all locales
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby and run bundle install
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Run i18n-tasks check-consistent-interpolations
+        run: bundle exec i18n-tasks check-consistent-interpolations -f yaml > inconsistent-interpolations.yml
+        continue-on-error: true
+
+      - name: Upload yaml of inconsistent interpolations
+        uses: actions/upload-artifact@v4
+        with:
+          name: inconsistent-interpolations
+          path: inconsistent-interpolations.yml

.github/workflows/reviewdog.yml

@@ -23,11 +23,12 @@ jobs:
           bundler-cache: true
 
       - name: rubocop
-        uses: reviewdog/action-rubocop@708a61f1f3bc4127205f5ec59f4f8617478ebdda
+        uses: reviewdog/action-rubocop@5e23bb67d79c93e5eb45bdae6d08b04052afec35
         with:
           use_bundler: true
           reporter: github-pr-check
           skip_install: true
+          fail_on_error: true
 
   erb-lint:
     name: ERB Lint runner
@@ -44,7 +45,8 @@ jobs:
           bundler-cache: true
 
       - name: erb-lint
-        uses: tk0miya/action-erblint@667687e73b44e7b7a710a1204b180f49f80ebb5e
+        uses: tk0miya/action-erblint@b6e537f4616e4fa7a9eef209ca34ca944e1440dd
         with:
           use_bundler: true
-          reporter: github-pr-check # default
+          reporter: github-pr-check
+          fail_on_error: true

.gitpod.yml

@@ -0,0 +1,17 @@
+tasks:
+  - init: ./script/docker/init.sh
+    command: docker compose up -d web
+
+ports:
+  - port: 3000
+    onOpen: open-browser
+  - port: 3306
+    onOpen: ignore
+  - port: 6379
+    onOpen: ignore
+  - port: 9200
+    onOpen: ignore
+  - port: 9300
+    onOpen: ignore
+  - port: 9400
+    onOpen: ignore

.phrase.yml

@@ -134,15 +134,15 @@ phrase:
       - file: ./config/locales/phrase-exports/ru.yml
         params:
           locale_id: ru
+      - file: ./config/locales/phrase-exports/scr.yml
+        params:
+          locale_id: scr
       - file: ./config/locales/phrase-exports/sk.yml
         params:
           locale_id: sk
       - file: ./config/locales/phrase-exports/sl.yml
         params:
           locale_id: sl
-      - file: ./config/locales/phrase-exports/sr.yml
-        params:
-          locale_id: sr
       - file: ./config/locales/phrase-exports/sv.yml
         params:
           locale_id: sv

.rubocop.yml

@@ -1,6 +1,3 @@
-# Uncomment the following line to ignore known issues
-# inherit_from: .rubocop_todo.yml
-
 # Options available at https://github.com/bbatsov/rubocop/blob/master/config/default.yml
 
 require:
@@ -14,7 +11,7 @@ inherit_mode:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Bundler/OrderedGems:
   Enabled: false
@@ -53,6 +50,12 @@ Lint/AmbiguousBlockAssociation:
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
+Lint/RedundantSafeNavigation:
+  Exclude:
+    # Take a better safe than sorry approach to safe navigation in admin
+    # policies.
+    - 'app/policies/*.rb'
+
 Metrics/AbcSize:
   Enabled: false