diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-25 17:01:02 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-25 17:01:02 -0500 |
| commit | 59cc61e246dd059d041793cf4fd29ee540c7d7d2 (patch) | |
| tree | bb26af94767ff636c3923d4c57651f07179f07ed | |
| parent | dee28c50a90acaf1a364d3971132c70c96493932 (diff) | |
| download | gitlab-ce-59cc61e246dd059d041793cf4fd29ee540c7d7d2.tar.gz | |
Bump doorkeeper to ~> 2.2.0rs-update-doorkeeper
Closes #2746
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -16,7 +16,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.2' gem 'devise-async', '~> 0.9.0' -gem 'doorkeeper', '~> 2.1.3' +gem 'doorkeeper', '~> 2.2.0' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-facebook', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 46247dd88e2..3cb986b39d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM docile (1.1.5) domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) - doorkeeper (2.1.4) + doorkeeper (2.2.2) railties (>= 3.2) dropzonejs-rails (0.7.1) rails (> 3.1) @@ -824,7 +824,7 @@ DEPENDENCIES devise-async (~> 0.9.0) devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) - doorkeeper (~> 2.1.3) + doorkeeper (~> 2.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) |