diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-19 01:34:58 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-19 01:34:58 -0800 |
| commit | a84a929428169022c6e365c80579ad587ecc55ed (patch) | |
| tree | f3dde64a47b9fa79f92d9157e2837810e645730d | |
| parent | 3f91da6816150f1e3b9c7747c7402b543f1d681a (diff) | |
| parent | 4748ae8c8ce59135d53fd40ab045bb3e08ac8adb (diff) | |
| download | gitlab-ce-a84a929428169022c6e365c80579ad587ecc55ed.tar.gz | |
Merge pull request #426 from RLovelett/resque-update
Fixes :public Warning In Resque When Running Any Rails Command
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 |