summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lovelett <ryan@wahvee.com>2012-02-18 09:37:58 -0600
committerRyan Lovelett <ryan@wahvee.com>2012-02-18 09:37:58 -0600
commit4748ae8c8ce59135d53fd40ab045bb3e08ac8adb (patch)
treef3dde64a47b9fa79f92d9157e2837810e645730d
parent3f91da6816150f1e3b9c7747c7402b543f1d681a (diff)
downloadgitlab-ce-4748ae8c8ce59135d53fd40ab045bb3e08ac8adb.tar.gz
Fixes the issue with Resque where it was complaining about :public no longer being used.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index ad2bc01296c..82658d0fdb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "acts_as_list"
gem "rdiscount"
gem "acts-as-taggable-on", "~> 2.1.0"
gem "drapper"
-gem "resque"
+gem "resque", "~> 1.20.0"
gem "httparty"
gem "charlock_holmes"
gem "foreman"
diff --git a/Gemfile.lock b/Gemfile.lock
index d894e438ad2..232d38ae71b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
redis (2.2.2)
redis-namespace (1.0.3)
redis (< 3.0.0)
- resque (1.19.0)
+ resque (1.20.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0.2)
sinatra (>= 0.9.2)
@@ -318,7 +318,7 @@ DEPENDENCIES
rails-footnotes
rake
rdiscount
- resque
+ resque (~> 1.20.0)
rspec-rails
sass-rails (= 3.2.3)
seed-fu