diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-30 00:18:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 00:18:08 +0200 |
| commit | 2848c08953a8555e06791170dbf1090575e05d8a (patch) | |
| tree | 53e8e98051c24ac4fb32ce5692e241b6a6391de3 /Gemfile | |
| parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
| parent | 969d04385157175dc9c9f46987976d8fc5771707 (diff) | |
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index ace4b58e6..4305c42b0 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'charlock_holmes', '~> 0.7.6' gem 'iso-639' gem 'chewy', '~> 5.0' gem 'cld3', '~> 3.2.4' -gem 'devise', '~> 4.6' +gem 'devise', '~> 4.7' gem 'devise-two-factor', '~> 3.1' group :pam_authentication, optional: true do @@ -43,6 +43,7 @@ gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' gem 'omniauth', '~> 1.9' +gem 'discard', '~> 1.1' gem 'doorkeeper', '~> 5.1' gem 'fast_blank', '~> 1.0' gem 'fastimage' |