Merge branch 'main' into feature/array-adapter

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,7 +12,13 @@ A clear and concise description of what the bug is.
 You can use https://main.avodemo.com/ as the base app for the given instructions.
 -->
 
-### Steps to Reproduce
+### Reproduction repository for the bug
+<!--
+Please add a link to a reproduction repository that we can download and run locally.
+Use the steps described here: https://docs.avohq.io/3.0/technical-support.html#reproduction-repository
+-->
+
+### Steps to use in the reproduction repository
 Steps to reproduce the behavior:
 1. Add this configuration '...'
 2. Go to '...'
@@ -23,9 +29,6 @@ Steps to reproduce the behavior:
 ### Expected behavior & Actual behavior
 <!-- Tell us what should happen and what happens instead. -->
 
-### Models and resource files
-<!-- If it helps with replicating the issue, please add models and resources configuration. -->
-
 ### System configuration
 **Avo version**:
 

.github/workflows/feature-tests.yml

@@ -40,6 +40,9 @@ jobs:
           - '6.1'
           - '7.1'
           - '8.0'
+        exclude:
+          - ruby: '3.1.4'
+            rails: '8.0'
     runs-on: ubuntu-latest
 
     env:

.github/workflows/system-tests.yml

@@ -39,6 +39,9 @@ jobs:
           - '6.1'
           - '7.1'
           - '8.0'
+        exclude:
+          - ruby: '3.1.4'
+            rails: '8.0'
     runs-on: ubuntu-latest
 
     env:

Appraisals

@@ -1,20 +1,14 @@
 ["3.1.4", "3.3.0"].each do |ruby_version|
-  ["6.1", "7.1", "7.2.0.beta2"].each do |rails_version|
+  ["6.1", "7.1", "8.0"].each do |rails_version|
+    # Rails 8 require ruby >= 3.2.0
+    next if ruby_version == "3.1.4" && rails_version == "8.0"
+
     appraise "rails-#{rails_version}-ruby-#{ruby_version}" do
       gem "psych", "< 4"
       gem "rails", "~> #{rails_version}"
       gem "activestorage", "~> #{rails_version}"
       gem "activestorage"
+      gem "acts-as-taggable-on"
     end
   end
-
-  # TODO: we'll probably have to remove these when Rails 8 is released
-  appraise "rails-8.0-ruby-#{ruby_version}" do
-    gem "psych", "< 4"
-    gem "rails", github: "rails/rails", branch: "main"
-    gem "activestorage", github: "rails/rails", branch: "main"
-
-    # Temporary Rails 8 support
-    gem "acts-as-taggable-on", github: "avo-hq/acts-as-taggable-on"
-  end
 end

Gemfile

@@ -21,12 +21,12 @@ gem 'cssbundling-rails'
 # Dependencies for dummy_app
 #
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-# gem "rails", "~> 7.1.0"
-gem "rails", github: "rails/rails", branch: "main"
+gem "rails", ">= 8.0.0"
+# gem "rails", github: "rails/rails", branch: "main"
 
 # Avo file filed requires this gem
 # gem "activestorage"
-gem "activestorage", github: "rails/rails", branch: "main"
+gem "activestorage", ">= 8.0.0"
 
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
@@ -114,6 +114,7 @@ gem "amazing_print"
 group :development, :test do
   gem "faker", require: false
   gem "i18n-tasks", "~> 1.0.12"
+  gem "ruby-openai"
   gem "erb-formatter", require: false
   # https://thoughtbot.com/blog/a-standard-way-to-lint-your-views
   gem "erb_lint", require: false
@@ -151,8 +152,7 @@ gem "active_median"
 
 gem 'acts_as_list'
 
-# gem 'acts-as-taggable-on', '~> 10.0'
-gem "acts-as-taggable-on", github: "avo-hq/acts-as-taggable-on"
+gem "acts-as-taggable-on", "~> 12.0"
 
 gem "bundler-integrity", "~> 1.0"