diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 09:07:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 09:07:54 +0000 |
| commit | 5ff1b520badaa2da217416964709f49f3ede350a (patch) | |
| tree | 821ddbc4062a56fd2a7f26a0776457da3e074859 /Gemfile.lock | |
| parent | eccfaf7c242ab8afec22cdaf68865763e780fdeb (diff) | |
| download | gitlab-ce-5ff1b520badaa2da217416964709f49f3ede350a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 c6828ecb2cd..4285cfac45e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,6 +370,7 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-markup (1.7.0) + gitlab-net-dns (0.9.1) gitlab-peek (0.0.1) railties (>= 4.0.0) gitlab-sidekiq-fetcher (0.5.2) @@ -596,7 +597,6 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) - net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) @@ -1173,6 +1173,7 @@ DEPENDENCIES gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) + gitlab-net-dns (~> 0.9.1) gitlab-peek (~> 0.0.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) @@ -1222,7 +1223,6 @@ DEPENDENCIES mini_magick minitest (~> 5.11.0) nakayoshi_fork (~> 0.0.4) - net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.2) |