diff options
author | ThibG <thib@sitedethib.com> | 2018-09-21 08:39:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-21 08:39:07 +0200 |
commit | 17464c10ad1693095a05fe445587804589d627e1 (patch) | |
tree | ecd2a077b038b864ac7912cba72dd59990fb6258 /Gemfile | |
parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
parent | 343acd96cccb16b1ecdc3a52a8733359d4a92633 (diff) |
Merge pull request #739 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 356081dbf..27d65f272 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' group :pam_authentication, optional: true do - gem 'devise_pam_authenticatable2', '~> 9.1' + gem 'devise_pam_authenticatable2', '~> 9.2' end gem 'net-ldap', '~> 0.10' @@ -88,7 +88,7 @@ gem 'tty-command', '~> 0.8', require: false gem 'tty-prompt', '~> 0.16', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2018' -gem 'webpacker', '~> 3.4' +gem 'webpacker', '~> 3.5' gem 'webpush' gem 'json-ld', '~> 2.2' |