Merge remote-tracking branch 'origin/develop' into task/1024

Author: ishikawa999

.rubocop.yml

@@ -45,10 +45,11 @@ Layout/SpaceBeforeBlockBraces:
   Enabled: false
 
 Layout/SpaceInsideBlockBraces:
-  Enabled: false
+  EnforcedStyle: no_space
+  SpaceBeforeBlockParameters: false
 
 Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
+  EnforcedStyle: no_space
 
 Lint/RaiseException:
   Enabled: true

.rubocop_todo.yml

@@ -564,27 +564,6 @@ Performance/RedundantMatch:
     - 'lib/redmine/wiki_formatting/textile/formatter.rb'
     - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'app/controllers/issues_controller.rb'
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/avatars_helper.rb'
-    - 'app/helpers/custom_fields_helper.rb'
-    - 'app/helpers/workflows_helper.rb'
-    - 'app/models/auth_source_ldap.rb'
-    - 'app/models/principal.rb'
-    - 'lib/redmine/access_control.rb'
-    - 'test/functional/imports_controller_test.rb'
-    - 'test/unit/issue_import_test.rb'
-    - 'test/unit/time_entry_import_test.rb'
-
-# Cop supports --auto-correct.
-Performance/Squeeze:
-  Exclude:
-    - 'test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.
 Performance/StringInclude:
@@ -594,23 +573,6 @@ Performance/StringInclude:
     - 'test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting/macros_test.rb'
 
-# Cop supports --auto-correct.
-Performance/StringReplacement:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/imports_helper.rb'
-    - 'app/helpers/settings_helper.rb'
-    - 'lib/redmine/core_ext/string/conversions.rb'
-    - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
-    - 'test/functional/repositories_cvs_controller_test.rb'
-    - 'test/functional/repositories_git_controller_test.rb'
-    - 'test/helpers/application_helper_test.rb'
-    - 'test/integration/repositories_git_test.rb'
-    - 'test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb'
-    - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb'
-    - 'test/unit/repository_cvs_test.rb'
-    - 'test/unit/repository_git_test.rb'
-
 # Cop supports --auto-correct.
 Performance/Sum:
   Exclude:
@@ -1830,4 +1792,4 @@ Style/ZeroLengthPredicate:
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 461
+  Max: 461

Gemfile

@@ -5,7 +5,7 @@ gem 'bundler', '>= 1.12.0'
 
 gem 'rails', '5.2.4.4'
 gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
-gem 'rouge', '~> 3.24.0'
+gem 'rouge', '~> 3.25.0'
 gem 'request_store', '~> 1.5.0'
 gem "mini_mime", "~> 1.0.1"
 gem "actionpack-xml_parser"
@@ -39,7 +39,7 @@ end
 
 # Optional gem for exporting the gantt to a PNG file
 group :minimagick do
-  gem 'mini_magick', '~> 4.10.1'
+  gem 'mini_magick', '~> 4.11.0'
 end
 
 # Optional Markdown support, not for JRuby

app/controllers/activities_controller.rb

@@ -59,19 +59,19 @@ def index
 
     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
       respond_to do |format|
-        format.html {
+        format.html do
           @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
           render :layout => false if request.xhr?
-        }
-        format.atom {
+        end
+        format.atom do
           title = l(:label_activity)
           if @author
             title = @author.name
           elsif @activity.scope.size == 1
             title = l("label_#{@activity.scope.first.singularize}_plural")
           end
           render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
-        }
+        end
       end
     end
 

app/controllers/application_controller.rb

@@ -276,8 +276,8 @@ def require_login
             head(:forbidden)
           end
         end
-        format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
-        format.any  { head :unauthorized }
+        format.js   {head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"'}
+        format.any  {head :unauthorized}
       end
       return false
     end
@@ -565,7 +565,7 @@ def render_error(arg)
       format.html do
         render :template => 'common/error', :layout => use_layout, :status => @status
       end
-      format.any { head @status }
+      format.any {head @status}
     end
   end
 

app/controllers/attachments_controller.rb

@@ -37,7 +37,7 @@ class AttachmentsController < ApplicationController
 
   def show
     respond_to do |format|
-      format.html {
+      format.html do
         if @attachment.container.respond_to?(:attachments)
           @attachments = @attachment.container.attachments.to_a
           if index = @attachments.index(@attachment)
@@ -64,7 +64,7 @@ def show
         else
           render :action => 'other'
         end
-      }
+      end
       format.api
     end
   end
@@ -113,13 +113,13 @@ def upload
 
     respond_to do |format|
       format.js
-      format.api {
+      format.api do
         if saved
           render :action => 'upload', :status => :created
         else
           render_validation_errors(@attachment)
         end
-      }
+      end
     end
   end
 
@@ -155,13 +155,13 @@ def update
     saved = @attachment.save
 
     respond_to do |format|
-      format.api {
+      format.api do
         if saved
           render_api_ok
         else
           render_validation_errors(@attachment)
         end
-      }
+      end
     end
   end
 
@@ -177,9 +177,9 @@ def destroy
     end
 
     respond_to do |format|
-      format.html { redirect_to_referer_or project_path(@project) }
+      format.html {redirect_to_referer_or project_path(@project)}
       format.js
-      format.api { render_api_ok }
+      format.api {render_api_ok}
     end
   end
 
@@ -207,6 +207,7 @@ def find_attachment
     @attachment = Attachment.find(params[:id])
     # Show 404 if the filename in the url is wrong
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
+
     @project = @attachment.project
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/auth_sources_controller.rb

@@ -78,7 +78,7 @@ def destroy
 
   def autocomplete_for_new_user
     results = AuthSource.search(params[:term])
-    render :json => results.map {|result|
+    json = results.map do |result|
       {
         'value' => result[:login],
         'label' => "#{result[:login]} (#{result[:firstname]} #{result[:lastname]})",
@@ -88,7 +88,8 @@ def autocomplete_for_new_user
         'mail' => result[:mail].to_s,
         'auth_source_id' => result[:auth_source_id].to_s
       }
-    }
+    end
+    render :json => json
   end
 
   private

app/controllers/auto_completes_controller.rb

@@ -53,12 +53,12 @@ def find_project
   end
 
   def format_issues_json(issues)
-    issues.map {|issue|
+    issues.map do |issue|
       {
         'id' => issue.id,
         'label' => "#{issue.tracker} ##{issue.id}: #{issue.subject.to_s.truncate(255)}",
         'value' => issue.id
       }
-    }
+    end
   end
 end

app/controllers/boards_controller.rb

@@ -37,7 +37,7 @@ def index
 
   def show
     respond_to do |format|
-      format.html {
+      format.html do
         sort_init 'updated_on', 'desc'
         sort_update 'created_on' => "#{Message.table_name}.id",
                     'replies' => "#{Message.table_name}.replies_count",
@@ -54,15 +54,15 @@ def show
           to_a
         @message = Message.new(:board => @board)
         render :action => 'show', :layout => !request.xhr?
-      }
-      format.atom {
+      end
+      format.atom do
         @messages = @board.messages.
           reorder(:id => :desc).
           includes(:author, :board).
           limit(Setting.feeds_limit.to_i).
           to_a
         render_feed(@messages, :title => "#{@project}: #{@board}")
-      }
+      end
     end
   end
 
@@ -89,16 +89,16 @@ def update
     @board.safe_attributes = params[:board]
     if @board.save
       respond_to do |format|
-        format.html {
+        format.html do
           flash[:notice] = l(:notice_successful_update)
           redirect_to_settings_in_projects
-        }
-        format.js { head 200 }
+        end
+        format.js {head 200}
       end
     else
       respond_to do |format|
-        format.html { render :action => 'edit' }
-        format.js { head 422 }
+        format.html {render :action => 'edit'}
+        format.js {head 422}
       end
     end
   end

app/controllers/context_menus_controller.rb

@@ -31,12 +31,13 @@ def issues
 
     @allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
 
-    @can = {:edit => @issues.all?(&:attributes_editable?),
-            :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
-            :copy => User.current.allowed_to?(:copy_issues, @projects) && Issue.allowed_target_projects.any?,
-            :add_watchers => User.current.allowed_to?(:add_issue_watchers, @projects),
-            :delete => @issues.all?(&:deletable?)
-            }
+    @can = {
+      :edit => @issues.all?(&:attributes_editable?),
+      :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
+      :copy => User.current.allowed_to?(:copy_issues, @projects) && Issue.allowed_target_projects.any?,
+      :add_watchers => User.current.allowed_to?(:add_issue_watchers, @projects),
+      :delete => @issues.all?(&:deletable?)
+    }
 
     @assignables = @issues.map(&:assignable_users).reduce(:&)
     @trackers = @projects.map {|p| Issue.allowed_target_trackers(p)}.reduce(:&)