Skip to content

Commit 7710fae

Browse files
committed
addressed compatability problem between sidekiq and connection_pool
1 parent 5093dbc commit 7710fae

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ gem 'net-http', '>= 0.4.0'
104104

105105
gem 'sprockets-rails', '>= 3.5.1'
106106

107+
gem 'connection_pool', '< 3'
108+
107109
group :development, :test do
108110
gem 'brakeman', require: false
109111
gem 'byebug', platforms: %i[mri mingw x64_mingw]

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ GEM
151151
climate_control (0.2.0)
152152
coderay (1.1.3)
153153
concurrent-ruby (1.3.6)
154-
connection_pool (3.0.2)
154+
connection_pool (2.5.5)
155155
crack (1.0.0)
156156
bigdecimal
157157
rexml
@@ -642,6 +642,7 @@ DEPENDENCIES
642642
byebug
643643
capybara (~> 3.40, >= 3.40.0)
644644
climate_control
645+
connection_pool (< 3)
645646
csv (~> 3.3, >= 3.3.4)
646647
database_cleaner (~> 2.0, >= 2.0.2)
647648
dotenv-rails (>= 3.2.0)

0 commit comments

Comments
 (0)