summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-08 23:04:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-08 23:04:30 +0300
commitdea2c19c2bc5b92a60fac5926801da33b20cadcd (patch)
tree91ac324cdd47dcfa1111f7ab1413e67d2af65e16
parent834e507ae44e98d269f6acc4ed3ee9deabac3de6 (diff)
downloadgitlab-ci-dea2c19c2bc5b92a60fac5926801da33b20cadcd.tar.gz
update sidekiq
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 7bd82ff..42aa3f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'haml-rails'
# Background jobs
gem 'slim'
gem 'sinatra', :require => nil
-gem 'sidekiq', '2.6.4'
+gem 'sidekiq'
# Scheduled
gem 'whenever', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 0015f2f..3c95a48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- facter (1.6.17)
+ facter (1.6.18)
factory_girl (4.1.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.1.0)
@@ -160,7 +160,7 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.2)
+ redis (3.0.3)
redis-namespace (1.2.1)
redis (~> 3.0.0)
rest-client (1.6.7)
@@ -191,7 +191,7 @@ GEM
settingslogic (2.0.8)
shoulda-matchers (1.3.0)
activesupport (>= 3.0.0)
- sidekiq (2.6.4)
+ sidekiq (2.9.0)
celluloid (~> 0.12.0)
connection_pool (~> 1.0)
multi_json (~> 1)
@@ -221,7 +221,7 @@ GEM
libv8 (~> 3.3.10)
thor (0.18.1)
tilt (1.3.6)
- timers (1.0.2)
+ timers (1.1.0)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
@@ -274,7 +274,7 @@ DEPENDENCIES
sass-rails (~> 3.2.3)
settingslogic
shoulda-matchers
- sidekiq (= 2.6.4)
+ sidekiq
sinatra
slim
stamp