diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 13:13:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 13:13:36 +0000 |
| commit | c96fdaaac38fd29436eba678468be28f40c28282 (patch) | |
| tree | db585208db7909bb7c1a4b67ba2a67140a64ac60 /Gemfile.lock | |
| parent | 65eb469990d7eb6cb974e438e8c782da9c20db8d (diff) | |
| download | gitlab-ce-c96fdaaac38fd29436eba678468be28f40c28282.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8a65cdc8cc6..caec5566219 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-mail_room (0.0.4) - gitlab-markup (1.7.0) + gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-puma (4.3.3.gitlab.2) nio4r (~> 2.0) @@ -857,7 +857,7 @@ GEM re2 (1.2.0) recaptcha (4.13.1) json - recursive-open-struct (1.1.0) + recursive-open-struct (1.1.1) redis (4.1.3) redis-actionpack (5.2.0) actionpack (>= 5, < 7) @@ -1245,7 +1245,7 @@ DEPENDENCIES gitlab-labkit (= 0.12.0) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.4) - gitlab-markup (~> 1.7.0) + gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) |