code cleanup: rubocop: fix Style/ParenthesesAroundCondition in app/helpers/applicatio...

git-svn-id: http://svn.redmine.org/redmine/trunk@18822 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 24d070e6de5b1693ad709a3d0ae97090536bb7c0..67d49f534eb45c3eb6cf5496cec2fbef5595bfbc 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1161,7 +1161,6 @@ Style/ParallelAssignment:
 # Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
 Style/ParenthesesAroundCondition:
   Exclude:
-    - 'app/helpers/application_helper.rb'
     - 'app/models/project.rb'
     - 'app/models/query.rb'
     - 'app/models/repository/subversion.rb'

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 121de247faf1ed75051cd9fe50432598227e839b..02c876ee1b44a0b338ca5e0f9585d172c2b06e6f 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -67,7 +67,7 @@ module ApplicationHelper
   def link_to_group(group, options={})
     if group.is_a?(Group)
       name = h(group.name)
-      if (User.current.admin?)
+      if User.current.admin?
         only_path = options[:only_path].nil? ? true : options[:only_path]
         link_to name, edit_group_path(group, :only_path => only_path)
       else
@@ -377,12 +377,12 @@ module ApplicationHelper
       projects.sort_by(&:lft).each do |project|
         # set the project environment to please macros.
         @project = project
-        if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
+        if ancestors.empty? || project.is_descendant_of?(ancestors.last)
           s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
         else
           ancestors.pop
           s << "</li>"
-          while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
+          while ancestors.any? && !project.is_descendant_of?(ancestors.last)
             ancestors.pop
             s << "</ul></li>\n"
           end