about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-10-13 16:29:17 +0200
committerGitHub <noreply@github.com>2021-10-13 16:29:17 +0200
commitebf2c3195615bb524f6908e84f99887c8775cbc3 (patch)
treeb393f2b0e0f5735338e495b1efe769ef97265e8c /Gemfile
parent022006577027ca040f4411489821f2e3311f0db6 (diff)
parent5169b374c64ee48a820c04d7c6e7f1f9235d2417 (diff)
Merge pull request #1620 from ClearlyClaire/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 5121e2249..c0be8c989 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '>= 2.5.0', '< 3.1.0'
 
 gem 'pkg-config', '~> 1.4'
 
-gem 'puma', '~> 5.4'
+gem 'puma', '~> 5.5'
 gem 'rails', '~> 6.1.4'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.1'
@@ -136,7 +136,7 @@ group :development do
   gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.4'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 1.21', require: false
+  gem 'rubocop', '~> 1.22', require: false
   gem 'rubocop-rails', '~> 2.12', require: false
   gem 'brakeman', '~> 5.1', require: false
   gem 'bundler-audit', '~> 0.9', require: false