diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
| commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
| tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /Gemfile.lock | |
| parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
| parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) | |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cede4aaf7..87298fc77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM activesupport charlock_holmes (0.7.5) chunky_png (1.3.8) - cld3 (3.2.1) + cld3 (3.2.2) ffi (>= 1.1.0, < 1.10.0) climate_control (0.2.0) cocaine (0.5.8) @@ -125,7 +125,7 @@ GEM css_parser (1.6.0) addressable debug_inspector (0.0.3) - devise (4.3.0) + devise (4.4.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.2) @@ -569,7 +569,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.5) cld3 (~> 3.2.0) climate_control (~> 0.2) - devise (~> 4.3) + devise (~> 4.4) devise-two-factor (~> 3.0) doorkeeper (~> 4.2) dotenv-rails (~> 2.2) @@ -651,7 +651,7 @@ DEPENDENCIES webpush RUBY VERSION - ruby 2.4.2p198 + ruby 2.5.0p0 BUNDLED WITH 1.16.1 |