diff --git a/Gemfile b/Gemfile index 86c386794aea4ad8d9b1b8c2641c3488a601b442..47c5f9c82ce2750ba852d7dc380b6c7e7c82da33 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ gem 'gpgme', '~> 2.0.19' # 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.1.1', require: 'omniauth-ldap' -gem 'net-ldap' +gem 'net-ldap', '~> 0.16.3' # API # Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged diff --git a/Gemfile.lock b/Gemfile.lock index 539657482c2ecca3327e1ff81cb4a3b10080e468..5d80473eb76846d6a39e8cc36b75ede299abe659 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -733,7 +733,7 @@ GEM nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) - net-ldap (0.16.2) + net-ldap (0.16.3) net-ntp (2.1.3) net-ssh (6.0.0) netrc (0.11.0) @@ -1423,7 +1423,7 @@ DEPENDENCIES minitest (~> 5.11.0) multi_json (~> 1.14.1) nakayoshi_fork (~> 0.0.4) - net-ldap + net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) nokogiri (~> 1.10.9) diff --git a/changelogs/unreleased/id-bump-net-ldap.yml b/changelogs/unreleased/id-bump-net-ldap.yml new file mode 100644 index 0000000000000000000000000000000000000000..556b20c430997ce5e91865ffc1a06c6b8d66a37d --- /dev/null +++ b/changelogs/unreleased/id-bump-net-ldap.yml @@ -0,0 +1,5 @@ +--- +title: Update net-ldap gem version +merge_request: 50888 +author: +type: other