use omniauth-ldap
This commit is contained in:
parent
77a9cafa8a
commit
a1c108656c
2 changed files with 15 additions and 0 deletions
14
debian/patches/0005-use-debian-omniauth-ldap.patch
vendored
Normal file
14
debian/patches/0005-use-debian-omniauth-ldap.patch
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
Index: gitlab/Gemfile
|
||||||
|
===================================================================
|
||||||
|
--- gitlab.orig/Gemfile
|
||||||
|
+++ gitlab/Gemfile
|
||||||
|
@@ -48,7 +48,8 @@ gem 'gitlab-grack', '~> 2.0.2', require:
|
||||||
|
# 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"
|
||||||
|
+# Debian package ruby-omniauth-ldap already includes gitlab patches
|
||||||
|
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
|
||||||
|
|
||||||
|
# Git Wiki
|
||||||
|
gem 'gollum-lib', '~> 4.0.2'
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -2,3 +2,4 @@ loosen-rails-version.patch
|
||||||
0002-loosen-devise.patch
|
0002-loosen-devise.patch
|
||||||
0003-loosen-doorkeeper.patch
|
0003-loosen-doorkeeper.patch
|
||||||
0004-loosen-rack-oauth2.patch
|
0004-loosen-rack-oauth2.patch
|
||||||
|
0005-use-debian-omniauth-ldap.patch
|
||||||
|
|
Loading…
Reference in a new issue