15 lines
609 B
Diff
15 lines
609 B
Diff
|
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'
|