diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-20 11:23:09 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-20 11:23:09 +0000 |
| commit | 37c934e089508e053e6ad4cf075b00cfaab53f3c (patch) | |
| tree | b76ead80122f44e409c0368377010e1771f37079 | |
| parent | f7ac8041f7ba3639085c26b4185eda00fd54a6e7 (diff) | |
| parent | 586fd6775d311692decb47dea63978433ee09fc9 (diff) | |
| download | gitlab-ce-37c934e089508e053e6ad4cf075b00cfaab53f3c.tar.gz | |
Merge branch 'fix_reliable_fetcher_version' into 'master'
Fix sidekiq-reliable-fetch version
Closes sidekiq-reliable-fetch#18
See merge request gitlab-org/gitlab-ce!23937
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -165,7 +165,7 @@ gem 'acts-as-taggable-on', '~> 5.0' gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'rufus-scheduler', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index 23a2bbeffdd..ed3b22a22cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) gitlab-markup (1.6.5) - gitlab-sidekiq-fetcher (0.1.0) + gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) @@ -1012,7 +1012,7 @@ DEPENDENCIES github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) - gitlab-sidekiq-fetcher (~> 0.1.0) + gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) |