debian-mirror-gitlab/debian/patches/0005-use-debian-omniauth-ldap.patch

15 lines
541 B
Diff
Raw Normal View History

2016-01-20 00:51:50 +05:30
Debian package contains gitlab patches
2016-02-09 14:02:25 +05:30
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13280
2016-01-20 00:51:50 +05:30
2016-09-13 18:27:13 +05:30
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,7 @@
2015-09-25 11:26:01 +05:30
# 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
2016-08-24 20:52:28 +05:30
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
2015-09-25 11:26:01 +05:30
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki
2016-06-02 11:31:04 +05:30
# Required manually in config/initializers/gollum.rb to control load order