Commit 3af576f8 authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch 'id-bump-net-ldap' into 'master'

Update net-ldap gem version

See merge request gitlab-org/gitlab!50888
parents c44b9979 c1b61a2c
...@@ -81,7 +81,7 @@ gem 'gpgme', '~> 2.0.19' ...@@ -81,7 +81,7 @@ gem 'gpgme', '~> 2.0.19'
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap' gem 'net-ldap', '~> 0.16.3'
# API # API
# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged # Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
......
...@@ -733,7 +733,7 @@ GEM ...@@ -733,7 +733,7 @@ GEM
nakayoshi_fork (0.0.4) nakayoshi_fork (0.0.4)
nap (1.1.0) nap (1.1.0)
nenv (0.3.0) nenv (0.3.0)
net-ldap (0.16.2) net-ldap (0.16.3)
net-ntp (2.1.3) net-ntp (2.1.3)
net-ssh (6.0.0) net-ssh (6.0.0)
netrc (0.11.0) netrc (0.11.0)
...@@ -1423,7 +1423,7 @@ DEPENDENCIES ...@@ -1423,7 +1423,7 @@ DEPENDENCIES
minitest (~> 5.11.0) minitest (~> 5.11.0)
multi_json (~> 1.14.1) multi_json (~> 1.14.1)
nakayoshi_fork (~> 0.0.4) nakayoshi_fork (~> 0.0.4)
net-ldap net-ldap (~> 0.16.3)
net-ntp net-ntp
net-ssh (~> 6.0) net-ssh (~> 6.0)
nokogiri (~> 1.10.9) nokogiri (~> 1.10.9)
......
---
title: Update net-ldap gem version
merge_request: 50888
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment