Download as
Browse Code »

Commit 96c06d7f5f413918989c4a4673b604875f09b9cd

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

update omniauth dependency

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @96c06d7
... ... @@ -29,7 +29,7 @@ gem 'gitlab_git', '~> 1.3.0'
29 29 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
30 30  
31 31 # LDAP Auth
32   -gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
  32 +gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
33 33  
34 34 # Syntax highlighter
35 35 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
... ...
Gemfile.lock
  Diff comments   View file @96c06d7
... ... @@ -168,8 +168,8 @@ GEM
168 168 github-linguist (~> 2.3.4)
169 169 gitlab-grit (~> 2.5.1)
170 170 gitlab_meta (5.0)
171   - gitlab_omniauth-ldap (1.0.2)
172   - net-ldap (~> 0.2.2)
  171 + gitlab_omniauth-ldap (1.0.3)
  172 + net-ldap (~> 0.3.1)
173 173 omniauth (~> 1.0)
174 174 pyu-ruby-sasl (~> 0.0.3.1)
175 175 rubyntlm (~> 0.1.1)
... ... @@ -265,7 +265,7 @@ GEM
265 265 multi_xml (0.5.3)
266 266 multipart-post (1.2.0)
267 267 mysql2 (0.3.11)
268   - net-ldap (0.2.2)
  268 + net-ldap (0.3.1)
269 269 nokogiri (1.5.9)
270 270 oauth (0.4.7)
271 271 oauth2 (0.8.1)
... ... @@ -544,7 +544,7 @@ DEPENDENCIES
544 544 gitlab-pygments.rb (~> 0.3.2)
545 545 gitlab_git (~> 1.3.0)
546 546 gitlab_meta (= 5.0)
547   - gitlab_omniauth-ldap (= 1.0.2)
  547 + gitlab_omniauth-ldap (= 1.0.3)
548 548 gon
549 549 grape (~> 0.4.1)
550 550 grape-entity (~> 0.3.0)
... ...