about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-10 21:45:32 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-05-10 21:45:32 +0200
commit7ac8bcf209cd2d72883ee3e5cfa7853620e417da (patch)
treec85cb56fe22a8172c82346e17d23392a45e0c741 /Gemfile
parentfc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac (diff)
parentd279666bd4353ba39c41e3607db7fd6862844947 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 215208c7a..93b87c159 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '>= 2.5.0', '< 3.1.0'
 
 gem 'pkg-config', '~> 1.4'
 
-gem 'puma', '~> 5.2'
+gem 'puma', '~> 5.3'
 gem 'rails', '~> 6.1.3'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.1'
@@ -75,7 +75,7 @@ gem 'rails-i18n', '~> 6.0'
 gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 4.2', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
-gem 'rqrcode', '~> 1.2'
+gem 'rqrcode', '~> 2.0'
 gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 5.2'
 gem 'scenic', '~> 1.5'
@@ -136,8 +136,8 @@ group :development do
   gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.4'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 1.13', require: false
-  gem 'rubocop-rails', '~> 2.9', require: false
+  gem 'rubocop', '~> 1.14', require: false
+  gem 'rubocop-rails', '~> 2.10', require: false
   gem 'brakeman', '~> 5.0', require: false
   gem 'bundler-audit', '~> 0.8', require: false