mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Merge branch 'master' into 5-0
This commit is contained in:
commit
064cd3304d
3 changed files with 8 additions and 7 deletions
|
@ -1,8 +1,9 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
|
gem 'appraisal'
|
||||||
gem 'pry'
|
gem 'pry'
|
||||||
gem 'sidekiq', :path => '..'
|
gem 'sidekiq', :path => '..'
|
||||||
gem 'rails', '5.0.0'
|
gem 'rails', '5.0.1'
|
||||||
|
|
||||||
platforms :ruby do
|
platforms :ruby do
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
PATH
|
PATH
|
||||||
remote: ../..
|
remote: ../..
|
||||||
specs:
|
specs:
|
||||||
sidekiq (4.2.6)
|
sidekiq (4.2.8)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
connection_pool (~> 2.2, >= 2.2.0)
|
connection_pool (~> 2.2, >= 2.2.0)
|
||||||
rack-protection (>= 1.5.0)
|
rack-protection (>= 1.5.0)
|
||||||
|
@ -53,7 +53,7 @@ GEM
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
coderay (1.1.1)
|
coderay (1.1.1)
|
||||||
concurrent-ruby (1.0.2)
|
concurrent-ruby (1.0.2)
|
||||||
connection_pool (2.2.0)
|
connection_pool (2.2.1)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
globalid (0.3.7)
|
globalid (0.3.7)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
|
@ -134,4 +134,4 @@ DEPENDENCIES
|
||||||
sqlite3
|
sqlite3
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.12.5
|
1.13.6
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
PATH
|
PATH
|
||||||
remote: ../..
|
remote: ../..
|
||||||
specs:
|
specs:
|
||||||
sidekiq (4.2.6)
|
sidekiq (4.2.8)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
connection_pool (~> 2.2, >= 2.2.0)
|
connection_pool (~> 2.2, >= 2.2.0)
|
||||||
rack-protection (>= 1.5.0)
|
rack-protection (>= 1.5.0)
|
||||||
|
@ -55,7 +55,7 @@ GEM
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
coderay (1.1.1)
|
coderay (1.1.1)
|
||||||
concurrent-ruby (1.0.2)
|
concurrent-ruby (1.0.2)
|
||||||
connection_pool (2.2.0)
|
connection_pool (2.2.1)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
globalid (0.3.7)
|
globalid (0.3.7)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
|
@ -138,4 +138,4 @@ DEPENDENCIES
|
||||||
sqlite3
|
sqlite3
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.12.5
|
1.13.6
|
||||||
|
|
Loading…
Add table
Reference in a new issue