diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-04 12:19:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-04 12:19:51 +0000 |
| commit | 124e7d5efc53cfacf6fb579328245e0619c73c9d (patch) | |
| tree | 57d8ad9c3030afcba71fa88b205d2ffaa41701ce | |
| parent | c12ce22a72acfb0c8492526013ff9b38bd7aee82 (diff) | |
| parent | bc2edc359d38014289c86d021fd49a77d1071b06 (diff) | |
| download | gitlab-ce-124e7d5efc53cfacf6fb579328245e0619c73c9d.tar.gz | |
Merge branch 'no-limit-fetch' into 'master'
Remove sidekiq-limit_fetch because it require Redis 2.6.
See merge request !491
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | config/initializers/4_sidekiq.rb | 2 |
3 files changed, 0 insertions, 6 deletions
@@ -122,7 +122,6 @@ gem 'slim' gem 'sinatra', require: nil gem 'sidekiq', '~> 3.3' gem 'sidetiq', '0.6.3' -gem 'sidekiq-limit_fetch' # HTTP requests gem "httparty" diff --git a/Gemfile.lock b/Gemfile.lock index c6ecdb4db0a..ed8663b358b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -547,8 +547,6 @@ GEM json redis (>= 3.0.6) redis-namespace (>= 1.3.1) - sidekiq-limit_fetch (2.4.1) - sidekiq (>= 2.6.5, < 4.0) sidetiq (0.6.3) celluloid (>= 0.14.1) ice_cube (= 0.11.1) @@ -771,7 +769,6 @@ DEPENDENCIES settingslogic shoulda-matchers (~> 2.7.0) sidekiq (~> 3.3) - sidekiq-limit_fetch sidetiq (= 0.6.3) simplecov sinatra diff --git a/config/initializers/4_sidekiq.rb b/config/initializers/4_sidekiq.rb index da2e8a08b07..e856499732e 100644 --- a/config/initializers/4_sidekiq.rb +++ b/config/initializers/4_sidekiq.rb @@ -25,5 +25,3 @@ Sidekiq.configure_client do |config| namespace: 'resque:gitlab' } end - -Sidekiq::Queue["archive_repo"].limit = 2 |