diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
commit | 6ab84c12a7ebc68fb8ce9a6b8228b28ec06a2c0f (patch) | |
tree | 0f023e22bcb1ae01ce3fb4e43b771609493e4e65 /Gemfile | |
parent | c94966891af1ff456c6382595c07c2d68c57ec49 (diff) | |
parent | 99924f282f53593e670c70a38450a1c0e2d24c20 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index e489e3090..4389f8ebd 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.24' + gem 'capybara', '~> 3.25' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.1' @@ -131,7 +131,7 @@ group :development do gem 'letter_opener', '~> 1.7' gem 'letter_opener_web', '~> 1.3' gem 'memory_profiler' - gem 'rubocop', '~> 0.71', require: false + gem 'rubocop', '~> 0.72', require: false gem 'rubocop-rails', '~> 2.0', require: false gem 'brakeman', '~> 4.5', require: false gem 'bundler-audit', '~> 0.6', require: false @@ -151,3 +151,4 @@ group :production do end gem 'concurrent-ruby', require: false +gem 'connection_pool', require: false |