diff --git a/Gemfile b/Gemfile index f69aa6db..4defcec3 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" diff --git a/Gemfile.lock b/Gemfile.lock index 458ace30..4b08c314 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,17 +39,6 @@ GIT grit_ext (0.6.1) charlock_holmes (~> 0.6.9) -GIT - remote: https://github.com/gitlabhq/omniauth-ldap.git - revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e - ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e - specs: - omniauth-ldap (1.0.2) - net-ldap (~> 0.2.2) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.1.1) - GIT remote: https://github.com/gitlabhq/pygments.rb.git revision: db1da0343adf86b49bdc3add04d02d2e80438d38 @@ -198,6 +187,11 @@ GEM pygments.rb (>= 0.2.13) github-markup (0.7.4) gitlab_meta (4.0) + gitlab_omniauth-ldap (1.0.2) + net-ldap (~> 0.2.2) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.1.1) gitlab_yaml_db (1.0.0) gitolite (1.1.0) gratr19 (~> 0.4.4.1) @@ -486,6 +480,7 @@ DEPENDENCIES github-linguist (~> 2.3.4) github-markup (~> 0.7.4) gitlab_meta (= 4.0) + gitlab_omniauth-ldap (= 1.0.2) gitlab_yaml_db (= 1.0.0) gitolite (= 1.1.0) grack! @@ -508,7 +503,6 @@ DEPENDENCIES omniauth (~> 1.1.1) omniauth-github omniauth-google-oauth2 - omniauth-ldap! omniauth-twitter pg poltergeist!