From 8ab29d569e8c0019bbe458dea6f05a9894f0711a Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Fri, 9 Jun 2017 08:27:39 -0700 Subject: Upgrade omniauth-ldap gem (and some dependencies) Most notably, the net-ldap gem. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7c7122a39ea..276893d0ff4 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'browser', '~> 2.2' # LDAP Auth # 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', '~> 1.2.1', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.0.1', require: 'omniauth-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order -- cgit v1.2.1 From 7f92a36a36ab8183c843982bf91bdabb45861154 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Tue, 13 Jun 2017 14:01:28 -0700 Subject: Fix plain LDAP (no encryption) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 276893d0ff4..7bb912571f4 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'browser', '~> 2.2' # LDAP Auth # 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.1', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.0.2', require: 'omniauth-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order -- cgit v1.2.1 From 6f5f80592499dace8900961e0c596771d46d588c Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Tue, 13 Jun 2017 15:25:06 -0700 Subject: Add net-ldap explicitly since we use it directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And this has already been done on EE, so it’ll match now. --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7bb912571f4..b9d206c2500 100644 --- a/Gemfile +++ b/Gemfile @@ -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 -- cgit v1.2.1