diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 19:44:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 19:44:23 +0000 |
| commit | 6b96d119aec0ba674cca2c380cf60f1500306612 (patch) | |
| tree | f7742d802f557d04e2144b06a2b47719fbd58b82 /Gemfile.lock | |
| parent | 8b7c4494871c7d69ac7bc59839bdce6ff2937f95 (diff) | |
| download | gitlab-ce-6b96d119aec0ba674cca2c380cf60f1500306612.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 319c4df3f9d..2e3537e223f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -390,7 +390,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.4) + gitlab-mail_room (0.0.6) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-puma (4.3.3.gitlab.2) @@ -1241,7 +1241,7 @@ DEPENDENCIES gitlab-chronic (~> 0.10.5) gitlab-labkit (= 0.12.0) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.4) + gitlab-mail_room (~> 0.0.6) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) |