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.lock | |
parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
parent | 343acd96cccb16b1ecdc3a52a8733359d4a92633 (diff) |
Merge pull request #739 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 8eda89d12..e4e1c69df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GEM devise (~> 4.0) railties (< 5.3) rotp (~> 2.0) - devise_pam_authenticatable2 (9.1.1) + devise_pam_authenticatable2 (9.2.0) devise (>= 4.0.0) rpam2 (~> 4.0) diff-lcs (1.3) @@ -629,7 +629,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (3.4.3) + webpacker (3.5.5) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -671,7 +671,7 @@ DEPENDENCIES derailed_benchmarks devise (~> 4.4) devise-two-factor (~> 3.0) - devise_pam_authenticatable2 (~> 9.1) + devise_pam_authenticatable2 (~> 9.2) doorkeeper (~> 5.0) dotenv-rails (~> 2.2, < 2.3) fabrication (~> 2.20) @@ -761,7 +761,7 @@ DEPENDENCIES twitter-text (~> 1.14) tzinfo-data (~> 1.2018) webmock (~> 3.3) - webpacker (~> 3.4) + webpacker (~> 3.5) webpush RUBY VERSION |