diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2018-10-05 09:21:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2018-10-05 09:21:25 +0000 |
| commit | 0412eed5a072f9f45d23bbfd86675e9affbb9877 (patch) | |
| tree | 4959c7ad2cc4032b874b930e3277f0009f1002d2 /Gemfile.rails5.lock | |
| parent | 89bcbdcac54f7785f488ab24847efca9e3eb7454 (diff) | |
| parent | c350f3ccd8e72d2e655210c74e508e7720763eb7 (diff) | |
| download | gitlab-ce-0412eed5a072f9f45d23bbfd86675e9affbb9877.tar.gz | |
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-05
# Conflicts:
# app/assets/javascripts/jobs/components/job_app.vue
# app/assets/javascripts/jobs/store/getters.js
# app/serializers/build_details_entity.rb
# doc/api/merge_requests.md
# locale/gitlab.pot
# spec/javascripts/jobs/components/job_app_spec.js
[ci skip]
Diffstat (limited to 'Gemfile.rails5.lock')
| -rw-r--r-- | Gemfile.rails5.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 79fe7442ac8..1864e5550af 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -329,6 +329,8 @@ GEM posix-spawn (~> 0.3) gitlab-license (1.0.0) 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) @@ -1075,6 +1077,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 4.2) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) |