diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-08 15:08:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-08 15:08:20 +0000 |
commit | 5693fb6ba7d21ba7b79775543a3f195eb989664b (patch) | |
tree | a9038b20872f0f3bd35de034bfb40e533435bfa5 /Gemfile.lock | |
parent | f149549c3432ffb179f6904e4ba0ea64027202d0 (diff) | |
download | gitlab-ce-5693fb6ba7d21ba7b79775543a3f195eb989664b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
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 8af96ada4d6..607551164ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -530,7 +530,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -1115,7 +1115,7 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.6) + validates_hostname (1.0.10) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) @@ -1401,7 +1401,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) - validates_hostname (~> 1.0.6) + validates_hostname (~> 1.0.10) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webmock (~> 3.5.1) |