Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ jobs:
- rails: "6.1 (default)"
gemfile: Gemfile
experimental: false
- rails: "7.0"
gemfile: gemfiles/rails_7_0.gemfile
experimental: true
- rails: "7.1"
gemfile: gemfiles/rails_7_1.gemfile
experimental: true
Expand Down
1 change: 1 addition & 0 deletions core/lib/workarea/configuration/sidekiq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ def configure_plugins!
end
end

require 'sidekiq/callbacks' unless defined?(::Sidekiq::Callbacks)
::Sidekiq::Callbacks.assert_valid_config!
# sidekiq-throttled 1.x automatically installs its server middleware when
# `sidekiq/throttled` is required; the old `.setup!` hook was removed.
Expand Down
2 changes: 1 addition & 1 deletion core/lib/workarea/core/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Engine < ::Rails::Engine
# doesn't rely on boolean return values from `sadd`, so opt into the
# Redis 5 behavior now to eliminate deprecation warnings.
require 'redis'
Redis.sadd_returns_boolean = false
Redis.sadd_returns_boolean = false if Redis.respond_to?(:sadd_returns_boolean=)

Configuration::Sidekiq.load
Configuration::CacheStore.load
Expand Down
5 changes: 5 additions & 0 deletions gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# frozen_string_literal: true

eval_gemfile File.expand_path('../Gemfile', __dir__)

gem 'rails', '7.0.10'
Loading