diff options
| author | Valery Sizov <valery@gitlab.com> | 2019-04-03 15:37:10 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2019-04-03 15:37:10 +0300 |
| commit | 2faf2f7ab801341e9027eb61d6fcfcbd31f07ccb (patch) | |
| tree | ed24c09d5a9d38bc25d8af8c4cf7cc5d8a6b2cee | |
| parent | bc696947fdf0423595cbbcf83b6dc94fb2d2290c (diff) | |
| download | gitlab-ce-ce-4193-ip-whitelisting-for-geo-enabling-functionality-in-the-primary.tar.gz | |
Geo: backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10383ce-4193-ip-whitelisting-for-geo-enabling-functionality-in-the-primary
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -291,6 +291,9 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' +# IPs and CIDRs +gem 'netaddr', '~> 1.5' + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4ebcc6c81b2..15183cd698b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -483,6 +483,7 @@ GEM nakayoshi_fork (0.0.4) net-ldap (0.16.0) net-ssh (5.0.1) + netaddr (1.5.1) netrc (0.11.0) nio4r (2.3.1) nokogiri (1.10.1) @@ -1067,6 +1068,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) + netaddr (~> 1.5) nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) |