From c1b61a2cab27fcb87b8487e30c2504b3050d4cf0 Mon Sep 17 00:00:00 2001
From: Igor Drozdov <idrozdov@gitlab.com>
Date: Tue, 5 Jan 2021 21:24:27 +0300
Subject: [PATCH] Update net-ldap gem version
It eliminates some Ruby 2.7 kwargs warnings and provides
multiple useful improvements
History:
https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc
Diff:
https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.2..v0.16.3
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
changelogs/unreleased/id-bump-net-ldap.yml | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 changelogs/unreleased/id-bump-net-ldap.yml
diff --git a/Gemfile b/Gemfile
index 86c386794aea..47c5f9c82ce2 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 539657482c2e..5d80473eb768 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 000000000000..556b20c43099
--- /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
--
GitLab