Commit 6ba14927 authored by Nick Thomas's avatar Nick Thomas Committed by James Edwards-Jones

Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-looking domain names

parent 7163da60
...@@ -49,7 +49,7 @@ gem 'attr_encrypted', '~> 3.0.0' ...@@ -49,7 +49,7 @@ gem 'attr_encrypted', '~> 3.0.0'
gem 'u2f', '~> 0.2.1' gem 'u2f', '~> 0.2.1'
# GitLab Pages # GitLab Pages
gem 'validates_hostname', '~> 1.0.0' gem 'validates_hostname', '~> 1.0.6'
# Browser detection # Browser detection
gem 'browser', '~> 2.2' gem 'browser', '~> 2.2'
......
...@@ -799,7 +799,7 @@ GEM ...@@ -799,7 +799,7 @@ GEM
get_process_mem (~> 0) get_process_mem (~> 0)
unicorn (>= 4, < 6) unicorn (>= 4, < 6)
uniform_notifier (1.10.0) uniform_notifier (1.10.0)
validates_hostname (1.0.5) validates_hostname (1.0.6)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
version_sorter (2.1.0) version_sorter (2.1.0)
...@@ -1017,7 +1017,7 @@ DEPENDENCIES ...@@ -1017,7 +1017,7 @@ DEPENDENCIES
unf (~> 0.1.4) unf (~> 0.1.4)
unicorn (~> 5.1.0) unicorn (~> 5.1.0)
unicorn-worker-killer (~> 0.4.4) unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.0) validates_hostname (~> 1.0.6)
version_sorter (~> 2.1.0) version_sorter (~> 2.1.0)
virtus (~> 1.0.1) virtus (~> 1.0.1)
vmstat (~> 2.3.0) vmstat (~> 2.3.0)
......
...@@ -20,6 +20,12 @@ describe PagesDomain, models: true do ...@@ -20,6 +20,12 @@ describe PagesDomain, models: true do
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
context 'valid hexadecimal-looking domain' do
let(:domain) { '0x12345.com'}
it { is_expected.to be_valid }
end
context 'no domain' do context 'no domain' do
let(:domain) { nil } let(:domain) { nil }
......
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