Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream #7

Merged
merged 50 commits into from
Feb 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
81e14ae
fix mistype: elasic -> elastic
solutus Oct 7, 2019
7e0a56e
readme: add gem version badge
palkan Jul 15, 2022
7230612
pass args to worker as array in inline mode
egor-lukin Sep 12, 2022
63f9c30
Optimized Lua script for Redis >= 6.2.0
russointroitoa Oct 19, 2022
823b200
Remove trailing spaces
russointroitoa Oct 19, 2022
07121bf
Use sadd? to remove warning message
russointroitoa Oct 21, 2022
83611a2
Fixes sidekiq deprecation
Ross-Hunter Aug 8, 2022
28be96c
Merge pull request #38 from solutus/elasic-mistype-patch-1
gzigzigzeo Nov 29, 2022
66adc7e
Merge pull request #45 from palkan/patch-1
gzigzigzeo Nov 29, 2022
d4f6c4c
Merge pull request #46 from Ross-Hunter/fix/options-deprecation
gzigzigzeo Nov 29, 2022
38562c2
Merge pull request #50 from russointroitoa/improve_lua_script
gzigzigzeo Nov 29, 2022
238c760
Merge pull request #48 from LukinEgor/fix/use-same-worker-interface-f…
gzigzigzeo Dec 1, 2022
77d2336
chore: Configure Rubocop and fix all lint issues
mrexox Dec 1, 2022
0f8da00
ci: Add test github action
mrexox Dec 1, 2022
7336953
ci: Add lint github action
mrexox Dec 2, 2022
19951e8
chore: YAML fix
mrexox Dec 2, 2022
36b224f
ci: Fix redis service ports mapping
mrexox Dec 2, 2022
a3e43eb
fix: Remove occasional fix for interval
mrexox Dec 2, 2022
6af76f7
chore: Add lefthook configuration
mrexox Dec 2, 2022
5cd4d0f
chore: Remove Travis config
mrexox Dec 2, 2022
a0d6475
chore: Appraise setting
mrexox Dec 2, 2022
2eb3b8d
fix: Fix tests
mrexox Dec 2, 2022
f9d8f36
chore: Apply rubocop settings
mrexox Dec 2, 2022
8682687
chore: Bump version upto 1.2.0
mrexox Dec 2, 2022
cc93d30
ci: Remove jruby from matrix
mrexox Dec 2, 2022
08512a0
fix: Use more verbose var name
mrexox Dec 2, 2022
4122dac
chore: Run tests before pushing
mrexox Dec 2, 2022
19cc8a8
Merge pull request #53 from mrexox/chore/lint-and-clean
gzigzigzeo Dec 2, 2022
7ffa30e
feature: Support Sidekiq 7
mrexox Dec 2, 2022
8fbc60f
chore: Fix rubocop issues
mrexox Dec 2, 2022
dc9f160
chore: Bump version
mrexox Dec 2, 2022
12cbb1c
chore: Update lefthook.yml
mrexox Dec 2, 2022
7dfa158
chore: Update lefthook.yml
mrexox Dec 2, 2022
0c68a93
Merge pull request #54 from mrexox/feature/support-sidekiq-upto-7
gzigzigzeo Dec 2, 2022
eccf101
Merge remote-tracking branch 'upstream/master' into sync-upstream
tomzagorski Mar 31, 2023
cf25ac5
fixing rubocop issues in non-spec files
tomzagorski Mar 31, 2023
0ed42f8
fixing rubocop issues in spec files
tomzagorski Mar 31, 2023
b1b0827
fixing specs
tomzagorski Mar 31, 2023
d5fb364
3.0 ruby_version needs to be quoted or else it jumps to 3.2 which app…
tomzagorski Apr 3, 2023
b4891fa
using redis dispatcher for reliable pluck
tomzagorski Apr 3, 2023
ed5dc9e
more redis dispatcher uses
tomzagorski Apr 3, 2023
4367dc3
renaming variable
tomzagorski Apr 3, 2023
f949ed9
build fixes
tomzagorski Apr 4, 2023
92abfb6
adding adapters for redis/redis-client
tomzagorski Apr 4, 2023
efa9643
removing unused methods
tomzagorski Apr 4, 2023
99d7daf
Merge remote-tracking branch 'origin/master' into sync-upstream-2
rex-remind101 Feb 17, 2024
28b9eb5
Merge pull request #9 from ParentSquare/sync-upstream-2
rex-remind101 Feb 20, 2024
c08bd8e
Prevent loading scripts multiple times per process
rex-remind101 Feb 28, 2024
d0add72
Merge pull request #10 from ParentSquare/sync-upstream-3
rex-remind101 Feb 28, 2024
be02a1f
fix rubocop errors
rex-remind101 Feb 28, 2024
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
Prev Previous commit
Next Next commit
Fixes sidekiq deprecation
  • Loading branch information
Ross-Hunter committed Oct 24, 2022
commit 83611a29af922266376c5c66e56a6a77b78fc0aa
2 changes: 1 addition & 1 deletion lib/sidekiq/grouping/config.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ module Sidekiq::Grouping::Config
include ActiveSupport::Configurable

def self.options
Sidekiq.options[:grouping] || Sidekiq.options["grouping"] || {} # sidekiq 5.x use symbol in keys
Sidekiq[:grouping] || Sidekiq["grouping"] || {} # sidekiq 5.x uses symbols
end

# Queue size overflow check polling interval