Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-30 17:15:56 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-30 17:15:56 +0400
commit64db5f808baa111e69f2588b5233a212d1343d68 (patch)
tree4aaefd7b1727eaf445a31d3caf03785c32ab2d5d /Gemfile
parentd863fa6283c80eaf2d549b73bf778b78a94ff89c (diff)
use gitlab omniauth-ldap gem instead of fork
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f69aa6db7a9..4defcec325f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,10 +23,12 @@ gem 'omniauth-github'
# GITLAB patched libs
gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
-gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
+# LDAP Auth
+gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
+
# Dump db to yml file. Mostly used to migrate from sqlite to mysql
gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"