Merge branch 'pin_sidekiq_version' into 'master'

Pin gem sidekiq version
2014-04-01 18:15:24 +00:00 · 2014-04-01 18:15:24 +00:00 · 973f9d30d9
parent f8b5429599 f732e6c8da
commit 973f9d30d9
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -102,7 +102,7 @@ gem "acts-as-taggable-on"
 # Background jobs
 gem 'slim'
 gem 'sinatra', require: nil
-gem 'sidekiq'
+gem 'sidekiq', '2.17.0'

 # HTTP requests
 gem "httparty"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -653,7 +653,7 @@ DEPENDENCIES
  select2-rails
  settingslogic
  shoulda-matchers (~> 2.1.0)
-  sidekiq
+  sidekiq (= 2.17.0)
  simplecov
  sinatra
  six