Commit 124e7d5e authored by Douwe Maan's avatar Douwe Maan

Merge branch 'no-limit-fetch' into 'master'

Remove sidekiq-limit_fetch because it require Redis 2.6.

See merge request !491
parents c12ce22a bc2edc35
...@@ -122,7 +122,6 @@ gem 'slim' ...@@ -122,7 +122,6 @@ gem 'slim'
gem 'sinatra', require: nil gem 'sinatra', require: nil
gem 'sidekiq', '~> 3.3' gem 'sidekiq', '~> 3.3'
gem 'sidetiq', '0.6.3' gem 'sidetiq', '0.6.3'
gem 'sidekiq-limit_fetch'
# HTTP requests # HTTP requests
gem "httparty" gem "httparty"
......
...@@ -547,8 +547,6 @@ GEM ...@@ -547,8 +547,6 @@ GEM
json json
redis (>= 3.0.6) redis (>= 3.0.6)
redis-namespace (>= 1.3.1) redis-namespace (>= 1.3.1)
sidekiq-limit_fetch (2.4.1)
sidekiq (>= 2.6.5, < 4.0)
sidetiq (0.6.3) sidetiq (0.6.3)
celluloid (>= 0.14.1) celluloid (>= 0.14.1)
ice_cube (= 0.11.1) ice_cube (= 0.11.1)
...@@ -771,7 +769,6 @@ DEPENDENCIES ...@@ -771,7 +769,6 @@ DEPENDENCIES
settingslogic settingslogic
shoulda-matchers (~> 2.7.0) shoulda-matchers (~> 2.7.0)
sidekiq (~> 3.3) sidekiq (~> 3.3)
sidekiq-limit_fetch
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simplecov simplecov
sinatra sinatra
......
...@@ -25,5 +25,3 @@ Sidekiq.configure_client do |config| ...@@ -25,5 +25,3 @@ Sidekiq.configure_client do |config|
namespace: 'resque:gitlab' namespace: 'resque:gitlab'
} }
end end
Sidekiq::Queue["archive_repo"].limit = 2
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment