diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-26 14:47:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-26 14:47:50 +0200 |
| commit | d29598e69190d6bc3a7d3cea44892d2db69d20e0 (patch) | |
| tree | 7b130b29dd5c4042846b51791ce1e09d7ea48326 /Gemfile | |
| parent | 5f35901a01ff822ba1e637251d9726a41e73ed17 (diff) | |
| parent | 2f825cad72cfc6fd25df3a57c5f3c138bb47f89d (diff) | |
| download | gitlab-ce-d29598e69190d6bc3a7d3cea44892d2db69d20e0.tar.gz | |
Merge remote-tracking branch 'dev/master'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |