Commit 58560843 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'update-validates-hostname-gem' into 'master'

Update validates_hostname and i18n gem patch levels

See merge request gitlab-org/gitlab!34010
parents 659f5859 5fa4b6bd
...@@ -63,7 +63,7 @@ gem 'attr_encrypted', '~> 3.1.0' ...@@ -63,7 +63,7 @@ gem 'attr_encrypted', '~> 3.1.0'
gem 'u2f', '~> 0.2.1' gem 'u2f', '~> 0.2.1'
# GitLab Pages # GitLab Pages
gem 'validates_hostname', '~> 1.0.6' gem 'validates_hostname', '~> 1.0.10'
gem 'rubyzip', '~> 2.0.0', require: 'zip' gem 'rubyzip', '~> 2.0.0', require: 'zip'
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0.5' gem 'acme-client', '~> 2.0.5'
......
...@@ -530,7 +530,7 @@ GEM ...@@ -530,7 +530,7 @@ GEM
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.2) i18n (1.8.3)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.8.0) i18n_data (0.8.0)
icalendar (2.4.1) icalendar (2.4.1)
...@@ -1115,7 +1115,7 @@ GEM ...@@ -1115,7 +1115,7 @@ GEM
validate_url (1.0.8) validate_url (1.0.8)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
public_suffix public_suffix
validates_hostname (1.0.6) validates_hostname (1.0.10)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
version_sorter (2.2.4) version_sorter (2.2.4)
...@@ -1401,7 +1401,7 @@ DEPENDENCIES ...@@ -1401,7 +1401,7 @@ DEPENDENCIES
unicorn-worker-killer (~> 0.4.4) unicorn-worker-killer (~> 0.4.4)
unleash (~> 0.1.5) unleash (~> 0.1.5)
valid_email (~> 0.1) valid_email (~> 0.1)
validates_hostname (~> 1.0.6) validates_hostname (~> 1.0.10)
version_sorter (~> 2.2.4) version_sorter (~> 2.2.4)
vmstat (~> 2.3.0) vmstat (~> 2.3.0)
webmock (~> 3.5.1) webmock (~> 3.5.1)
......
---
title: Update validates_hostname gem with support for more TLDs
merge_request: 34010
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment