diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 23:01:19 +0200 |
| commit | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (patch) | |
| tree | 4d1f3b2c9bdcadcf0fe53372a75ba54c0c06875a /Gemfile | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
| parent | cfca28bc874125e63e7e1a3c96d94bd5a7eca108 (diff) | |
Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 43d8d2fd0..991ef0861 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '>= 2.4.0', '< 2.7.0' gem 'pkg-config', '~> 1.3' -gem 'puma', '~> 4.0' +gem 'puma', '~> 4.1' gem 'rails', '~> 5.2.3' gem 'thor', '~> 0.20' @@ -32,7 +32,7 @@ gem 'iso-639' gem 'chewy', '~> 5.0' gem 'cld3', '~> 3.2.4' gem 'devise', '~> 4.6' -gem 'devise-two-factor', '~> 3.0' +gem 'devise-two-factor', '~> 3.1' group :pam_authentication, optional: true do gem 'devise_pam_authenticatable2', '~> 9.2' |