Merge branch 'require_ipaddress' into 'master'

Explicitly require `ipaddress` gem See merge request gitlab-org/gitlab!44460

Merge branch 'require_ipaddress' into 'master'
Explicitly require `ipaddress` gem See merge request gitlab-org/gitlab!44460
6a6185aa · Dylan Griffith · e4f5a527 · 5f539625 · 6a6185aa · 6a6185aa
Commit 6a6185aa authored Oct 07, 2020 by Dylan Griffith
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Gemfile Gemfile +3 -0

Gemfile.lock Gemfile.lock +1 -0

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -517,3 +517,6 @@ gem 'multi_json', '~> 1.14.1'
 gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'

 gem 'webauthn', '~> 2.3'
+
+# IPAddress utilities
+gem 'ipaddress', '~> 0.8.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1362,6 +1362,7 @@ DEPENDENCIES
  httparty (~> 0.16.4)
  icalendar
  invisible_captcha (~> 0.12.1)
+  ipaddress (~> 0.8.3)
  jira-ruby (~> 2.0.0)
  js_regex (~> 3.4)
  json (~> 2.3.0)