Fix new rubocop warnings

diff --git a/app/helpers/user_mailer_helper.rb b/app/helpers/user_mailer_helper.rb
index 39977f5a7339a524ef95b81376e08ba98857d3dd..e5d6e39aca4a6259f95a92c1ed2c873d63877ed0 100644 (file)
--- a/app/helpers/user_mailer_helper.rb
+++ b/app/helpers/user_mailer_helper.rb
@@ -29,7 +29,7 @@ module UserMailerHelper
     # Because we can't use stylesheets in HTML emails, we need to inline the
     # styles. Rather than copy-paste the same string of CSS into every message,
     # we apply it once here, after the message has been composed.
-    html.gsub(/<p>/, '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">')
+    html.gsub("<p>", '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">')
   end
 
   def style_left

diff --git a/app/models/language.rb b/app/models/language.rb
index 1158721e8de9cf062ff911bd6d6ee5028393d445..f346c8a748aeb94dc44bf6d4d8769ffe8ba0bdaa 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -14,7 +14,7 @@ class Language < ApplicationRecord
 
   def self.load(file)
     Language.transaction do
-      YAML.safe_load(File.read(file)).each do |k, v|
+      YAML.safe_load_file(file).each do |k, v|
         Language.update(k, :english_name => v["english"], :native_name => v["native"])
       rescue ActiveRecord::RecordNotFound
         Language.create do |l|

diff --git a/lib/osm_community_index.rb b/lib/osm_community_index.rb
index 7ce379d0f54cae7b755d78035dc7585a245c49f7..a5c2fba72d2b93c9f1e6a566e0cf2ba95f6a1d94 100644 (file)
--- a/lib/osm_community_index.rb
+++ b/lib/osm_community_index.rb
@@ -6,7 +6,7 @@ module OsmCommunityIndex
     files = Rails.root.glob("node_modules/osm-community-index/i18n/*.yaml")
     files.each do |file|
       locale = File.basename(file, ".yaml")
-      community_locale_yaml = YAML.safe_load(File.read(file))[locale]
+      community_locale_yaml = YAML.safe_load_file(file)[locale]
       # rails wants language-COUNTRY but osm-community-index uses underscores
       locale_rails = locale.tr("_", "-")