Commit 01ab0812 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'doorkeeper_update' into 'master'

Doorkeeper update

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398

See merge request !1392
parents 8ac16a6b 1c49c301
...@@ -29,7 +29,7 @@ gem 'omniauth-twitter' ...@@ -29,7 +29,7 @@ gem 'omniauth-twitter'
gem 'omniauth-github' gem 'omniauth-github'
gem 'omniauth-shibboleth' gem 'omniauth-shibboleth'
gem 'omniauth-kerberos' gem 'omniauth-kerberos'
gem 'doorkeeper', '2.0.1' gem 'doorkeeper', '2.1.0'
gem "rack-oauth2", "~> 1.0.5" gem "rack-oauth2", "~> 1.0.5"
# Browser detection # Browser detection
......
...@@ -109,7 +109,7 @@ GEM ...@@ -109,7 +109,7 @@ GEM
diff-lcs (1.2.5) diff-lcs (1.2.5)
diffy (3.0.3) diffy (3.0.3)
docile (1.1.5) docile (1.1.5)
doorkeeper (2.0.1) doorkeeper (2.1.0)
railties (>= 3.1) railties (>= 3.1)
dotenv (0.9.0) dotenv (0.9.0)
dropzonejs-rails (0.4.14) dropzonejs-rails (0.4.14)
...@@ -633,7 +633,7 @@ DEPENDENCIES ...@@ -633,7 +633,7 @@ DEPENDENCIES
devise (= 3.2.4) devise (= 3.2.4)
devise-async (= 0.9.0) devise-async (= 0.9.0)
diffy (~> 3.0.3) diffy (~> 3.0.3)
doorkeeper (= 2.0.1) doorkeeper (= 2.1.0)
dropzonejs-rails dropzonejs-rails
email_spec email_spec
enumerize enumerize
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment