about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-05-15 18:44:21 +0200
committerGitHub <noreply@github.com>2019-05-15 18:44:21 +0200
commitc1cf8c1636e0a639cced585f0cb234547a64d417 (patch)
tree77b40e8bb0b1682bebaebebfa32d135ba406ac14 /Gemfile
parent4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (diff)
parent6badf2d252a980d496b894c7258a778c57639953 (diff)
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 3ed4989c8..b9a9159de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ group :production, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 3.18'
+  gem 'capybara', '~> 3.19'
   gem 'climate_control', '~> 0.2'
   gem 'faker', '~> 1.9'
   gem 'microformats', '~> 4.1'
@@ -129,7 +129,7 @@ group :development do
   gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.3'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 0.68', require: false
+  gem 'rubocop', '~> 0.69', require: false
   gem 'brakeman', '~> 4.5', require: false
   gem 'bundler-audit', '~> 0.6', require: false
   gem 'scss_lint', '~> 0.58', require: false