Merge branch 'main' into refactor/better-engine-mounting

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,8 @@
+blank_issues_enabled: false
 contact_links:
+  - name: Ask a question
+    url: https://github.com/avo-hq/avo/discussions
+    about: Ask questions and discuss with other community members
   - name: Priority Support
     url: https://avohq.io/support
     about: Get fast support from the authors of Avo

.github/workflows/i18n-tests.yml

@@ -106,12 +106,12 @@ jobs:
       id: run_tests
       run: bundle exec rspec spec/system/i18n_spec.rb
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: coverage_system_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
         path: coverage/.resultset.json
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && steps.run_tests.outcome == 'failure'
       with:
         name: rspec_failed_screenshots_rails_${{ matrix.rails }}_ruby_${{ matrix.ruby }}

.github/workflows/system-tests.yml

@@ -111,12 +111,12 @@ jobs:
       id: run_tests
       run: bundle exec rspec spec/system/ --tag=~i18n
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: coverage_system_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
         path: coverage/.resultset.json
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && steps.run_tests.outcome == 'failure'
       with:
         name: rspec_failed_screenshots_rails_${{ matrix.rails }}_ruby_${{ matrix.ruby }}

.gitignore

@@ -77,3 +77,4 @@ brakeman_results.html
 
 .env
 .env.test
+*~

Appraisals

@@ -9,6 +9,12 @@
       gem "activestorage", "~> #{rails_version}"
       gem "activestorage"
       gem "acts-as-taggable-on"
+
+      if rails_version == "6.1"
+        # Fix `<module:LoggerThreadSafeLevel>': uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger (NameError)
+        # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+        gem "concurrent-ruby", "1.3.4"
+      end
     end
   end
 end

Gemfile

@@ -175,7 +175,7 @@ gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 
 gem "mapkick-rb", "~> 0.1.4"
-
+gem "mapkick-static"
 gem "pluggy", path: "./pluggy"
 
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"