diff options
| author | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
| commit | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (patch) | |
| tree | cc559ad868e13d934ff539bd2da836ddad3ea5fc /Gemfile.lock | |
| parent | cdb159f27e2aeb2cf3bb184ac20b7056b013f714 (diff) | |
| parent | c1cf8c1636e0a639cced585f0cb234547a64d417 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b170b9aa3..98cd2103d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,7 @@ GEM ffi (~> 1.10.0) bootsnap (1.4.4) msgpack (~> 1.0) - brakeman (4.5.0) + brakeman (4.5.1) browser (2.5.3) builder (3.2.3) bullet (6.0.0) @@ -129,7 +129,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.18.0) + capybara (3.19.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -529,13 +529,13 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.8.0) - rubocop (0.68.1) + rubocop (0.69.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) + unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) ruby-saml (1.9.0) nokogiri (>= 1.5.10) @@ -630,7 +630,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) uniform_notifier (1.12.1) warden (1.2.8) rack (>= 2.0.6) @@ -673,7 +673,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.18) + capybara (~> 3.19) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.4) @@ -751,7 +751,7 @@ DEPENDENCIES rqrcode (~> 0.10) rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) - rubocop (~> 0.68) + rubocop (~> 0.69) sanitize (~> 5.0) scss_lint (~> 0.58) sidekiq (~> 5.2) |