Merge branch 'master' into rails-7

varvet · May 3, 2022 · bd7ddc4 · bd7ddc4
2 parents eae8b8a + ae493d7
commit bd7ddc4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ config/initializers/secret_token.rb
 /test/dummy/log/*
 /test/dummy/tmp/*
 /test/dummy/db/*.sqlite3
+/test/dummy/db/*.sqlite3-journal
 /test/tmp/*
 Gemfile.lock
 .tags

diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ rvm:
   - 2.6.7
   - 2.7.3
   - 3.0.1
+  - 3.1.1
 gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
@@ -15,6 +16,8 @@ matrix:
   exclude:
     - rvm: 3.0.1
       gemfile: gemfiles/rails_5.gemfile
+    - rvm: 3.1.1
+      gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.6.7
       gemfile: gemfiles/rails_7.gemfile
 

diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -4,5 +4,8 @@ source "https://rubygems.org"
 
 gem "admin", path: "../test/dummy/admin", group: [:test, :development]
 gem "rails", "~> 6.1"
+gem "net-imap", require: false
+gem "net-pop", require: false
+gem "net-smtp", require: false
 
 gemspec path: "../"