From af67ade56335eae4268781fb2b394f5aca24a4ce Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 7 Oct 2019 07:20:26 +0000
Subject: [PATCH] code cleanup: rubocop: fix Lint/UselessAccessModifier in
 app/models/changeset.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18607 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop_todo.yml       |  5 -----
 app/models/changeset.rb | 17 +++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 207bef397..19796721a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -591,11 +591,6 @@ Lint/UriEscapeUnescape:
     - 'lib/redmine/scm/adapters/subversion_adapter.rb'
     - 'test/functional/wiki_controller_test.rb'
 
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'app/models/changeset.rb'
-
 Lint/UselessAssignment:
   Enabled: false
 
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index b9d2c1f53..fe1831f9f 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -284,14 +284,15 @@ class Changeset < ActiveRecord::Base
     return @short_comments, @long_comments
   end
 
-  public
+  # singleton class are public
+  class << self
+    # Strips and reencodes a commit log before insertion into the database
+    def normalize_comments(str, encoding)
+      Changeset.to_utf8(str.to_s.strip, encoding)
+    end
 
-  # Strips and reencodes a commit log before insertion into the database
-  def self.normalize_comments(str, encoding)
-    Changeset.to_utf8(str.to_s.strip, encoding)
-  end
-
-  def self.to_utf8(str, encoding)
-    Redmine::CodesetUtil.to_utf8(str, encoding)
+    def to_utf8(str, encoding)
+      Redmine::CodesetUtil.to_utf8(str, encoding)
+    end
   end
 end