diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
| commit | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (patch) | |
| tree | 9fc0be073bc2ed5bf4231d850106f214fdeb020e /Gemfile.lock | |
| parent | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (diff) | |
| parent | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ed35f4a7b..4c03ffc5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM docile (1.3.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.4.2) railties (>= 4.2) dotenv (2.2.2) dotenv-rails (2.2.2) @@ -220,8 +220,6 @@ GEM fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.5.0) - fog-core (>= 1.27, < 3.0) fog-openstack (0.1.25) fog-core (~> 1.40) fog-json (>= 1.0) @@ -674,14 +672,13 @@ DEPENDENCIES devise (~> 4.4) devise-two-factor (~> 3.0) devise_pam_authenticatable2 (~> 9.1) - doorkeeper (~> 4.2, < 4.3) + doorkeeper (~> 4.4) dotenv-rails (~> 2.2, < 2.3) fabrication (~> 2.20) faker (~> 1.8) fast_blank (~> 1.0) fastimage fog-core (~> 1.45) - fog-local (~> 0.5) fog-openstack (~> 0.1) fuubar (~> 2.2) goldfinger (~> 2.1) |