From c5b5c2e7a5872e0e4e02fbb11abed2c58bebda45 Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Sat, 21 Mar 2015 09:34:33 -0600
Subject: [PATCH] Add sidetiq dependency

Add the sidetiq gem to the Gemfile to match EE.
---
 CHANGELOG    | 1 +
 Gemfile      | 1 +
 Gemfile.lock | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4c644960088..25d18501bc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.10.0 (unreleased)
   - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger)
   - Add a service to support external wikis (Hannes Rosenögger)
   - List new commits for newly pushed branch in activity view.
+  - Add sidetiq gem dependency to match EE
   - Add changelog, license and contribution guide links to project sidebar.
   - Improve diff UI
   - Fix alignment of navbar toggle button (Cody Mize)
diff --git a/Gemfile b/Gemfile
index 285ccf32b66..e7f75055f3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,6 +121,7 @@ gem "acts-as-taggable-on"
 gem 'slim'
 gem 'sinatra', require: nil
 gem 'sidekiq', '~> 3.3'
+gem 'sidetiq', '0.6.3'
 
 # HTTP requests
 gem "httparty"
diff --git a/Gemfile.lock b/Gemfile.lock
index 80eebc16e4c..4f1cab43dd5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,6 +290,7 @@ GEM
     httpauth (0.2.1)
     httpclient (2.5.3.3)
     i18n (0.7.0)
+    ice_cube (0.11.1)
     ice_nine (0.10.0)
     jasmine (2.0.2)
       jasmine-core (~> 2.0.0)
@@ -546,6 +547,10 @@ GEM
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
+    sidetiq (0.6.3)
+      celluloid (>= 0.14.1)
+      ice_cube (= 0.11.1)
+      sidekiq (>= 3.0.0)
     simple_oauth (0.1.9)
     simplecov (0.9.0)
       docile (~> 1.1.0)
@@ -764,6 +769,7 @@ DEPENDENCIES
   settingslogic
   shoulda-matchers (~> 2.7.0)
   sidekiq (~> 3.3)
+  sidetiq (= 0.6.3)
   simplecov
   sinatra
   six