Merge remote-tracking branch 'dev/master'
# Conflicts: # Gemfile # Gemfile.lock
Showing
... | ... | @@ -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.3', require: 'omniauth-ldap' | ||
gem 'net-ldap' | ||
# Git Wiki | ||
# Required manually in config/initializers/gollum.rb to control load order | ||
... | ... |
Please register or sign in to comment