Merge branch 'master' into html-translations

excid3 · Oct 12, 2023 · b9a0bd1 · b9a0bd1
2 parents 3164d1b + fdc3293
commit b9a0bd1
Show file tree

Hide file tree

Showing 28 changed files with 1,478 additions and 916 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,31 +12,37 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - rails_5_2
           - rails_6
           - rails_6_1
           - rails_7
-          - rails_master
+          - rails_7_1
+          - rails_main
         exclude:
           - ruby: '3.0'
             gemfile: 'rails_5_2'
           - ruby: '3.1'
             gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_6'
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       BUNDLE_PATH_RELATIVE_TO_CWD: true
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: default
           bundler-cache: true
+          rubygems: latest
 
       - name: StandardRb check
         run: bundle exec standardrb
@@ -53,18 +59,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - rails_5_2
           - rails_6
           - rails_6_1
           - rails_7
-          - rails_master
+          - rails_7_1
+          - rails_main
         exclude:
           - ruby: '3.0'
             gemfile: 'rails_5_2'
           - ruby: '3.1'
             gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_6'
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       BUNDLE_PATH_RELATIVE_TO_CWD: true
@@ -79,14 +90,15 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: default
           bundler-cache: true
+          rubygems: latest
 
       - name: StandardRb check
         run: bundle exec standardrb
@@ -103,18 +115,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - rails_5_2
           - rails_6
           - rails_6_1
           - rails_7
-          - rails_master
+          - rails_7_1
+          - rails_main
         exclude:
           - ruby: '3.0'
             gemfile: 'rails_5_2'
           - ruby: '3.1'
             gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_5_2'
+          - ruby: '3.2'
+            gemfile: 'rails_6'
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       BUNDLE_PATH_RELATIVE_TO_CWD: true
@@ -129,14 +146,15 @@ jobs:
         ports: ['5432:5432']
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: default
           bundler-cache: true
+          rubygems: latest
 
       - name: StandardRb check
         run: bundle exec standardrb

diff --git a/.standard.yml b/.standard.yml
@@ -1,3 +1,4 @@
+ruby_version: 2.7
 ignore:
   - '**/*':
     - Style/HashSyntax
diff --git a/Appraisals b/Appraisals
@@ -14,6 +14,10 @@ appraise "rails-7" do
   gem "rails", "~> 7.0.0"
 end
 
-appraise "rails-master" do
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1.0"
+end
+
+appraise "rails-main" do
   gem "rails", github: "rails/rails", branch: "main"
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 ### Unreleased
 
+### 1.6.3
+
+* Fix `debug` and `ignore_failure` options in `post` requests. #284 - @mike-burns
+* Add `logger` option to delivery methods to allow overriding the logger (defaults to `Rails.logger`) - @excid3
+
+### 1.6.2
+
+* Improve deprecation fix to include Rails 7.1.0.alpha and higher
+
+### 1.6.1
+
+* Fix overridden `Object#method` in `Noticed::DeliveryMethods::Email` - @quadule
+* Fix Rails 7.1 deprecation warning #281 - @excid3
+
 ### 1.6.0
 
 * Catch deserialization errors. Instead of raising an ActiveRecord::RecordNotFound error, Noticed will replace params with information about the error.

diff --git a/Gemfile b/Gemfile
@@ -11,6 +11,13 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
+gem "standard"
+gem "webmock"
+
+gem "pg"
+gem "mysql2"
+gem "sqlite3", "~> 1.6.0.rc2"
+
 # To use a debugger
 gem "byebug", group: [:development, :test]
 gem "appraisal"