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.lock | |
| parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
| parent | 969d04385157175dc9c9f46987976d8fc5771707 (diff) | |
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0af2b2a89..274d4601b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM brakeman (4.6.1) browser (2.6.1) builder (3.2.3) - bullet (6.0.1) + bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.6.1) @@ -188,10 +188,10 @@ GEM rack (>= 1) rake (> 10, < 13) thor (~> 0.19) - devise (4.6.2) + devise (4.7.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-two-factor (3.1.0) @@ -204,6 +204,8 @@ GEM devise (>= 4.0.0) rpam2 (~> 4.0) diff-lcs (1.3) + discard (1.1.0) + activerecord (>= 4.2, < 7) docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) @@ -555,7 +557,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.3.0) + rubocop-rails (2.3.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) @@ -692,9 +694,10 @@ DEPENDENCIES concurrent-ruby connection_pool derailed_benchmarks - devise (~> 4.6) + devise (~> 4.7) devise-two-factor (~> 3.1) devise_pam_authenticatable2 (~> 9.2) + discard (~> 1.1) doorkeeper (~> 5.1) dotenv-rails (~> 2.7) fabrication (~> 2.20) |