diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 21:07:43 +0000 |
| commit | 015663b70f1bcdae4483e38c2beac884f92da5b8 (patch) | |
| tree | 6dd5a59c7f9a27c3cca22801ca30bf3dd8f9b401 /Gemfile.lock | |
| parent | 5eb11b697d7ee280b0b5c2ff9a1850a3b5e9b7e3 (diff) | |
| download | gitlab-ce-015663b70f1bcdae4483e38c2beac884f92da5b8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 24d321cccb1..35aa419e2e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -734,6 +734,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.1.4) + png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) premailer (1.11.1) @@ -1286,8 +1287,10 @@ DEPENDENCIES omniauth_crowd (~> 2.2.0) omniauth_openid_connect (~> 0.3.3) org-ruby (~> 0.9.12) + parallel (~> 1.17.0) peek (~> 1.1) pg (~> 1.1) + png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) |