Merge branch 'pin_sidekiq_version' into 'master'

Pin gem sidekiq version

Merge branch 'pin_sidekiq_version' into 'master'
Pin gem sidekiq version
973f9d30 · Dmitriy Zaporozhets · f8b54295 · f732e6c8 · 973f9d30 · 973f9d30
Commit 973f9d30 authored Apr 01, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -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