kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'bump-reliable-fetcher' into 'master'

Browse source 
Bump reliable fetcher

See merge request gitlab-org/gitlab-ce!32565
This commit is contained in:
Stan Hu 2019-09-03 06:20:37 +00:00
commit 991143eb1f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -171,7 +171,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
gem 'sidekiq', '~> 5.2.7' gem 'sidekiq', '~> 5.2.7'
gem 'sidekiq-cron', '~> 1.0' gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.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 # Cron Parser
gem 'fugit', '~> 1.2.1' gem 'fugit', '~> 1.2.1'

4
Gemfile.lock
View file

@ -321,7 +321,7 @@ GEM
gitlab-markup (1.7.0) gitlab-markup (1.7.0)
gitlab-peek (0.0.1) gitlab-peek (0.0.1)
railties (>= 4.0.0) railties (>= 4.0.0)
gitlab-sidekiq-fetcher (0.5.1) gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.8.0) gitlab-styles (2.8.0)
rubocop (~> 0.69.0) rubocop (~> 0.69.0)
@ -1098,7 +1098,7 @@ DEPENDENCIES
gitlab-labkit (~> 0.5) gitlab-labkit (~> 0.5)
gitlab-markup (~> 1.7.0) gitlab-markup (~> 1.7.0)
gitlab-peek (~> 0.0.1) gitlab-peek (~> 0.0.1)
gitlab-sidekiq-fetcher (= 0.5.1) gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 2.7) gitlab-styles (~> 2.7)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)