diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-20 11:23:09 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-02 17:36:33 +0000 |
| commit | d0e3e197046180b527655708d26d2a9317dcd686 (patch) | |
| tree | c597176925c20f7157628814ecc5ad6460b94bc9 | |
| parent | d2f5bf39cca7684f4834bfc8d7614901c7cd2542 (diff) | |
| download | gitlab-ce-d0e3e197046180b527655708d26d2a9317dcd686.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
(cherry picked from commit 37c934e089508e053e6ad4cf075b00cfaab53f3c)
586fd677 Fix sidekiq-reliable-fetch version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -181,7 +181,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 7bc8fdbcb09..96bbfa7d4e1 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) @@ -1011,7 +1011,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) |