Commit 6a6185aa authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'require_ipaddress' into 'master'

Explicitly require `ipaddress` gem

See merge request gitlab-org/gitlab!44460
parents e4f5a527 5f539625
...@@ -517,3 +517,6 @@ gem 'multi_json', '~> 1.14.1' ...@@ -517,3 +517,6 @@ gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
gem 'webauthn', '~> 2.3' gem 'webauthn', '~> 2.3'
# IPAddress utilities
gem 'ipaddress', '~> 0.8.3'
...@@ -1362,6 +1362,7 @@ DEPENDENCIES ...@@ -1362,6 +1362,7 @@ DEPENDENCIES
httparty (~> 0.16.4) httparty (~> 0.16.4)
icalendar icalendar
invisible_captcha (~> 0.12.1) invisible_captcha (~> 0.12.1)
ipaddress (~> 0.8.3)
jira-ruby (~> 2.0.0) jira-ruby (~> 2.0.0)
js_regex (~> 3.4) js_regex (~> 3.4)
json (~> 2.3.0) json (~> 2.3.0)
......
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