diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-03 06:20:37 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-03 06:20:37 +0000 |
| commit | 991143eb1f1bb5cda1f709ad44fdc021aa12b75d (patch) | |
| tree | 997669426d2b7efee62fce2f58fb547d125043df | |
| parent | e1aab74f07f383e9ba301e200134a36bc5a7860a (diff) | |
| parent | 898350e30be0e2ef18f51ddbab6900d542af53ed (diff) | |
| download | gitlab-ce-991143eb1f1bb5cda1f709ad44fdc021aa12b75d.tar.gz | |
Merge branch 'bump-reliable-fetcher' into 'master'
Bump reliable fetcher
See merge request gitlab-org/gitlab-ce!32565
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -171,7 +171,7 @@ gem 'acts-as-taggable-on', '~> 6.0' gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' -gem 'gitlab-sidekiq-fetcher', '0.5.1', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index c83f9b9076a..f0b3d722326 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,7 +321,7 @@ GEM gitlab-markup (1.7.0) gitlab-peek (0.0.1) railties (>= 4.0.0) - gitlab-sidekiq-fetcher (0.5.1) + gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) gitlab-styles (2.8.0) rubocop (~> 0.69.0) @@ -1098,7 +1098,7 @@ DEPENDENCIES gitlab-labkit (~> 0.5) gitlab-markup (~> 1.7.0) gitlab-peek (~> 0.0.1) - gitlab-sidekiq-fetcher (= 0.5.1) + gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) |