Skip to content
Closed
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
2 changes: 1 addition & 1 deletion rails/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ gem 'omniauth', '>= 1.7.0'
gem 'rack-cors', :require => 'rack/cors'

# Required for delayed jobs
gem 'sidekiq', '~>4.0'
gem 'sidekiq', '~>5.2'

# Kaminari handles pagination
gem 'kaminari', '~> 1.1.1'
Expand Down
17 changes: 8 additions & 9 deletions rails/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
connection_pool (2.2.2)
concurrent-ruby (1.1.9)
connection_pool (2.2.5)
crass (1.0.4)
devise (4.4.3)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -333,9 +333,9 @@ GEM
powerpack (0.1.2)
public_suffix (3.0.2)
puma (3.12.0)
rack (2.0.5)
rack (2.2.3)
rack-cors (1.0.2)
rack-protection (2.0.3)
rack-protection (2.1.0)
rack
rack-test (1.0.0)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -428,11 +428,10 @@ GEM
selenium-webdriver (3.13.1)
childprocess (~> 0.5)
rubyzip (~> 1.2)
sidekiq (4.2.10)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
sidekiq (5.2.0)
connection_pool (~> 2.2, >= 2.2.2)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
redis (>= 3.3.5, < 5)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
Expand Down Expand Up @@ -520,7 +519,7 @@ DEPENDENCIES
rubyzip (~> 1.2.1)
sass-rails (~> 5.0)
selenium-webdriver
sidekiq (~> 4.0)
sidekiq (~> 5.2)
spring
spring-watcher-listen (~> 2.0.0)
streamio-ffmpeg (~> 3.0.2)
Expand Down