diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-03-20 14:47:19 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-03-20 15:13:38 +0200 |
| commit | 5df1609c82483f6477b2174c216e540417a465cb (patch) | |
| tree | f5ad2aef23e403e9d0504ea4560260432e06fcf2 | |
| parent | c6dd117c71a326a09a1e6d546d6d0c98a21e3f1d (diff) | |
| download | gitlab-ce-5df1609c82483f6477b2174c216e540417a465cb.tar.gz | |
update doorkeeper to 2.1.3
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' gem 'omniauth-kerberos' gem 'omniauth-gitlab' gem 'omniauth-bitbucket' -gem 'doorkeeper', '2.1.0' +gem 'doorkeeper', '2.1.3' gem "rack-oauth2", "~> 1.0.5" # Browser detection diff --git a/Gemfile.lock b/Gemfile.lock index 54753f5e016..044788dee6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,8 +136,8 @@ GEM diff-lcs (1.2.5) diffy (3.0.3) docile (1.1.5) - doorkeeper (2.1.0) - railties (>= 3.1) + doorkeeper (2.1.3) + railties (>= 3.2) dotenv (0.9.0) dropzonejs-rails (0.4.14) rails (> 3.1) @@ -683,7 +683,7 @@ DEPENDENCIES devise (= 3.2.4) devise-async (= 0.9.0) diffy (~> 3.0.3) - doorkeeper (= 2.1.0) + doorkeeper (= 2.1.3) dropzonejs-rails email_spec enumerize |