Merge branch 'master' into lg.scim_rails_7_compatibility

.travis.yml

@@ -8,6 +8,8 @@ gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
   - gemfiles/rails_6.1.gemfile
+  - gemfiles/rails_7.gemfile
+
 before_script:
   - bin/rails db:migrate RAILS_ENV=test
 before_install:

Appraisals

@@ -9,3 +9,7 @@ end
 appraise "rails-6.1" do
   gem "rails", "~> 6.1"
 end
+
+appraise "rails-7" do
+  gem "rails", "~> 7.0"
+end

gemfiles/rails_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0"
+gem "pry", group: [:development, :test]
+
+gemspec path: "../"

scim_rails.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.4"
   s.add_dependency "rails", ">= 5.0"
+
   s.add_runtime_dependency "jwt", ">= 1.5"
   s.test_files = Dir["spec/**/*"]
 

spec/dummy/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+#Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path