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 | |
parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 268bf3ad8..dc72851b3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.5.0' +ruby '>= 2.3.0', '< 2.6.0' gem 'pkg-config', '~> 1.2' @@ -29,7 +29,7 @@ gem 'browser' gem 'charlock_holmes', '~> 0.7.5' gem 'iso-639' gem 'cld3', '~> 3.2.0' -gem 'devise', '~> 4.3' +gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' gem 'doorkeeper', '~> 4.2' gem 'fast_blank', '~> 1.0' |