summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-25 16:18:22 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-25 16:18:22 +0200
commit3c1022f9b118f004c421f212e55acbe1d4ff3954 (patch)
treefd9fe416b1a0fc20489fc48e86d0480b55794b59 /Gemfile.lock
parent64db738f9de3839090eef6a862581a0e72f6540d (diff)
downloadgitlab-ce-3c1022f9b118f004c421f212e55acbe1d4ff3954.tar.gz
No resque errors
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock20
1 files changed, 13 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d8be14ba80a..a086bb4921b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,6 +14,17 @@ GIT
rake (>= 0.8.7)
GIT
+ remote: https://github.com/defunkt/resque.git
+ revision: 9ef4700306dd946a3ac000612428967ce0c32213
+ ref: 9ef4700306dd946a3ac000612428967ce0c32213
+ specs:
+ resque (2.0.0.pre.1)
+ json
+ redis-namespace (~> 1.0)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+
+GIT
remote: https://github.com/gitlabhq/grack.git
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
@@ -315,7 +326,7 @@ GEM
rack (>= 1.1.3)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-protection (1.2.0)
+ rack-protection (1.3.2)
rack
rack-ssl (1.3.2)
rack
@@ -351,11 +362,6 @@ GEM
redis (3.0.2)
redis-namespace (1.2.1)
redis (~> 3.0.0)
- resque (1.23.0)
- multi_json (~> 1.0)
- redis-namespace (~> 1.0)
- sinatra (>= 0.9.2)
- vegas (~> 0.1.2)
resque_mailer (2.1.0)
actionmailer (~> 3.0)
resque_spec (0.12.5)
@@ -512,7 +518,7 @@ DEPENDENCIES
rb-fsevent
rb-inotify
redcarpet (~> 2.2.2)
- resque (~> 1.23.0)
+ resque!
resque_mailer
resque_spec
rspec-rails