diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-14 01:23:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-14 01:23:53 +0000 |
| commit | 01ab08125982b7c786818ffdd608e6169d0ff43d (patch) | |
| tree | 7302d949dda54452d150b0bac32ce97172f247c1 | |
| parent | 8ac16a6b321d7754c42badca11dcf36b2857b492 (diff) | |
| parent | 1c49c30119ebce11f3a0b7cc93dc0c88e04d39db (diff) | |
| download | gitlab-ce-01ab08125982b7c786818ffdd608e6169d0ff43d.tar.gz | |
Merge branch 'doorkeeper_update' into 'master'
Doorkeeper update
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398
See merge request !1392
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -29,7 +29,7 @@ gem 'omniauth-twitter' gem 'omniauth-github' gem 'omniauth-shibboleth' gem 'omniauth-kerberos' -gem 'doorkeeper', '2.0.1' +gem 'doorkeeper', '2.1.0' gem "rack-oauth2", "~> 1.0.5" # Browser detection diff --git a/Gemfile.lock b/Gemfile.lock index 94e29735b71..c6aa35a3917 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM diff-lcs (1.2.5) diffy (3.0.3) docile (1.1.5) - doorkeeper (2.0.1) + doorkeeper (2.1.0) railties (>= 3.1) dotenv (0.9.0) dropzonejs-rails (0.4.14) @@ -633,7 +633,7 @@ DEPENDENCIES devise (= 3.2.4) devise-async (= 0.9.0) diffy (~> 3.0.3) - doorkeeper (= 2.0.1) + doorkeeper (= 2.1.0) dropzonejs-rails email_spec enumerize |