From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 May 2022 07:16:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3544'
X-Git-Tag: live~1831
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ef12e7d4722e87aa01e70a4a4f4fa52acc031306?hp=2e339c900de09fe138ed0d178a6aa3f188aa9019

Merge remote-tracking branch 'upstream/pull/3544'
---

diff --git a/.rubocop.yml b/.rubocop.yml
index 65db8a6a5..dc7590df3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -96,6 +96,12 @@ Style/MixinUsage:
     - 'bin/setup'
     - 'bin/update'
 
+Style/RedundantCondition:
+  Exclude:
+    - 'app/controllers/messages_controller.rb'
+    - 'app/controllers/sessions_controller.rb'
+    - 'app/controllers/users_controller.rb'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7888111f6..623831222 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.582.0)
+    aws-partitions (1.585.0)
     aws-sdk-core (3.130.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -95,7 +95,7 @@ GEM
     aws-sdk-kms (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.2)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -215,7 +215,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.2.0)
+    faraday (2.3.0)
       faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (2.0.2)
@@ -305,7 +305,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.5)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (0.4.7)
@@ -420,12 +420,12 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.28.2)
+    rubocop (1.29.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
+      rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
@@ -482,7 +482,7 @@ GEM
     strong_migrations (1.0.0)
       activerecord (>= 5.2)
     strscan (3.0.1)
-    terser (1.1.8)
+    terser (1.1.9)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
     tilt (2.0.10)
@@ -595,4 +595,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.16
+   2.3.7