Merge branch 'add-sidetiq' into 'master'

Add sidetiq dependency

Add the sidetiq gem to the Gemfile to match EE.  See #2159.

cc @sytse

See merge request !1734

CHANGELOG

@@ -8,6 +8,7 @@ v 7.10.0 (unreleased)
   - Fix a link in the patch update guide
   - 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)

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"

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