summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 08:14:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 08:14:05 +0300
commitc7bb3a1f726be189ccce51bdd631b26eb4f64db1 (patch)
tree9e55df4e9e0e4543dfd77de459888f1c0a47a41d /Gemfile
parent7bfd38eaa95988accfc6bb09759d7688126f5692 (diff)
downloadgitlab-ce-c7bb3a1f726be189ccce51bdd631b26eb4f64db1.tar.gz
sidekiq
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d6e5899e3e7..eebd4c7cf4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,8 +81,10 @@ gem "acts-as-taggable-on", "2.3.3"
gem "draper", "~> 0.18.0"
# Background jobs
-gem "resque", git: "https://github.com/gitlabhq/resque.git", ref: "9ef4700306dd946a3ac000612428967ce0c32213"
-gem 'resque_mailer'
+gem 'slim'
+gem 'sinatra', :require => nil
+gem 'sidekiq', '2.6.4'
+gem 'sidekiq_mailer'
# HTTP requests
gem "httparty"
@@ -157,7 +159,6 @@ group :test do
gem "simplecov", require: false
gem "shoulda-matchers", "1.3.0"
gem 'email_spec'
- gem 'resque_spec'
gem "webmock"
gem 'test_after_commit'
end