Download as
Browse Code »

Commit 64db5f808baa111e69f2588b5233a212d1343d68

Authored by Dmitriy Zaporozhets
1 parent d863fa62
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

use gitlab omniauth-ldap gem instead of fork

Showing 2 changed files with 9 additions and 13 deletions   Show diff stats
@@ -23,10 +23,12 @@ gem 'omniauth-github' @@ -23,10 +23,12 @@ gem 'omniauth-github'
23 23
24 # GITLAB patched libs 24 # GITLAB patched libs
25 gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837' 25 gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
26 -gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'  
27 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' 26 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
28 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e' 27 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
29 28
  29 +# LDAP Auth
  30 +gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
  31 +
30 # Dump db to yml file. Mostly used to migrate from sqlite to mysql 32 # Dump db to yml file. Mostly used to migrate from sqlite to mysql
31 gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db" 33 gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
32 34
@@ -40,17 +40,6 @@ GIT @@ -40,17 +40,6 @@ GIT
40 charlock_holmes (~> 0.6.9) 40 charlock_holmes (~> 0.6.9)
41 41
42 GIT 42 GIT
43 - remote: https://github.com/gitlabhq/omniauth-ldap.git  
44 - revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e  
45 - ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e  
46 - specs:  
47 - omniauth-ldap (1.0.2)  
48 - net-ldap (~> 0.2.2)  
49 - omniauth (~> 1.0)  
50 - pyu-ruby-sasl (~> 0.0.3.1)  
51 - rubyntlm (~> 0.1.1)  
52 -  
53 -GIT  
54 remote: https://github.com/gitlabhq/pygments.rb.git 43 remote: https://github.com/gitlabhq/pygments.rb.git
55 revision: db1da0343adf86b49bdc3add04d02d2e80438d38 44 revision: db1da0343adf86b49bdc3add04d02d2e80438d38
56 branch: master 45 branch: master
@@ -198,6 +187,11 @@ GEM @@ -198,6 +187,11 @@ GEM
198 pygments.rb (>= 0.2.13) 187 pygments.rb (>= 0.2.13)
199 github-markup (0.7.4) 188 github-markup (0.7.4)
200 gitlab_meta (4.0) 189 gitlab_meta (4.0)
  190 + gitlab_omniauth-ldap (1.0.2)
  191 + net-ldap (~> 0.2.2)
  192 + omniauth (~> 1.0)
  193 + pyu-ruby-sasl (~> 0.0.3.1)
  194 + rubyntlm (~> 0.1.1)
201 gitlab_yaml_db (1.0.0) 195 gitlab_yaml_db (1.0.0)
202 gitolite (1.1.0) 196 gitolite (1.1.0)
203 gratr19 (~> 0.4.4.1) 197 gratr19 (~> 0.4.4.1)
@@ -486,6 +480,7 @@ DEPENDENCIES @@ -486,6 +480,7 @@ DEPENDENCIES
486 github-linguist (~> 2.3.4) 480 github-linguist (~> 2.3.4)
487 github-markup (~> 0.7.4) 481 github-markup (~> 0.7.4)
488 gitlab_meta (= 4.0) 482 gitlab_meta (= 4.0)
  483 + gitlab_omniauth-ldap (= 1.0.2)
489 gitlab_yaml_db (= 1.0.0) 484 gitlab_yaml_db (= 1.0.0)
490 gitolite (= 1.1.0) 485 gitolite (= 1.1.0)
491 grack! 486 grack!
@@ -508,7 +503,6 @@ DEPENDENCIES @@ -508,7 +503,6 @@ DEPENDENCIES
508 omniauth (~> 1.1.1) 503 omniauth (~> 1.1.1)
509 omniauth-github 504 omniauth-github
510 omniauth-google-oauth2 505 omniauth-google-oauth2
511 - omniauth-ldap!  
512 omniauth-twitter 506 omniauth-twitter
513 pg 507 pg
514 poltergeist! 508 poltergeist!