diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-06-13 15:25:06 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-07-26 02:43:41 -0700 |
| commit | 6f5f80592499dace8900961e0c596771d46d588c (patch) | |
| tree | 6ab1e546e6e1e9832dbd61c7b1b6e592fb2e2b87 | |
| parent | 26ee3a28029597f6813e652a09288504e9a2291d (diff) | |
| download | gitlab-ce-6f5f80592499dace8900961e0c596771d46d588c.tar.gz | |
Add net-ldap explicitly since we use it directly
And this has already been done on EE, so it’ll match now.
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -62,6 +62,7 @@ gem 'browser', '~> 2.2' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.0.2', require: 'omniauth-ldap' +gem 'net-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order diff --git a/Gemfile.lock b/Gemfile.lock index 661f0294646..c21b8d43b32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1013,6 +1013,7 @@ DEPENDENCIES minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.5) + net-ldap nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.4) octokit (~> 4.6.2) |