Merge branch 'develop' into depfu/update/rubocop-rspec-3.0.3

sanger · Jul 23, 2024 · a491413 · a491413
2 parents d2f202e + 58976e4
commit a491413
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.0
+3.3.4
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -242,7 +242,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

diff --git a/lib/client_side_validations.rb b/lib/client_side_validations.rb
@@ -21,7 +21,8 @@ def html_validation_attributes(attr_name)
       end
 
       def validationErrorMsg(attr_name)
-        nil if @regexp[attr_name].nil?
+        return if @regexp[attr_name].nil?
+
         @regexp[attr_name][:error_msg]
       end