diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-04 19:58:25 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-04 19:58:25 +0300 |
| commit | 1973d0c183218e7ca826d627eaea5ce91a17bed3 (patch) | |
| tree | 31f823cb61a7b1e43ba17a3c4fabb30485369b48 /Gemfile.lock | |
| parent | 707148ebae4cdda42b2b0cc5f87a6aa49615728f (diff) | |
| parent | 34687cf05deadccdd6b4b321c71d276ee0e72f49 (diff) | |
Merge branch 'add_reliable_fetcher' into 'master'
Add reliable sidekiq fetcher
See merge request gitlab-org/gitlab-ce!21715
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 301f4132476..9837a195d8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,6 +301,8 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -1031,6 +1033,7 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) |