Merge pull request #12239 from opf/fix/lint-autocorrect-rubocop

lint: Run rubocop safe autocorrect

app/contracts/admin_only_contract.rb

@@ -27,7 +27,7 @@
 #++
 
 # A contract that only checks whether the current user is an admin
-class AdminOnlyContract < ::ModelContract
+class AdminOnlyContract < ModelContract
   include RequiresAdminGuard
 
   protected

app/controllers/attribute_help_texts_controller.rb

@@ -35,6 +35,10 @@ class AttributeHelpTextsController < ApplicationController
   before_action :find_entry, only: %i(edit update destroy)
   before_action :find_type_scope
 
+  def index
+    @texts_by_type = AttributeHelpText.all_by_scope
+  end
+
   def new
     @attribute_help_text = AttributeHelpText.new type: @attribute_scope
   end
@@ -43,32 +47,32 @@ def edit; end
 
   def upsale; end
 
-  def update
-    call = ::AttributeHelpTexts::UpdateService
-      .new(user: current_user, model: @attribute_help_text)
+  def create
+    call = ::AttributeHelpTexts::CreateService
+      .new(user: current_user)
       .call(permitted_params_with_attachments)
 
     if call.success?
-      flash[:notice] = t(:notice_successful_update)
-      redirect_to attribute_help_texts_path(tab: @attribute_help_text.attribute_scope)
+      flash[:notice] = t(:notice_successful_create)
+      redirect_to attribute_help_texts_path(tab: call.result.attribute_scope)
     else
+      @attribute_help_text = call.result
       flash[:error] = call.message || I18n.t('notice_internal_server_error')
-      render action: 'edit'
+      render action: 'new'
     end
   end
 
-  def create
-    call = ::AttributeHelpTexts::CreateService
-      .new(user: current_user)
+  def update
+    call = ::AttributeHelpTexts::UpdateService
+      .new(user: current_user, model: @attribute_help_text)
       .call(permitted_params_with_attachments)
 
     if call.success?
-      flash[:notice] = t(:notice_successful_create)
-      redirect_to attribute_help_texts_path(tab: call.result.attribute_scope)
+      flash[:notice] = t(:notice_successful_update)
+      redirect_to attribute_help_texts_path(tab: @attribute_help_text.attribute_scope)
     else
-      @attribute_help_text = call.result
       flash[:error] = call.message || I18n.t('notice_internal_server_error')
-      render action: 'new'
+      render action: 'edit'
     end
   end
 
@@ -82,10 +86,6 @@ def destroy
     redirect_to attribute_help_texts_path(tab: @attribute_help_text.attribute_scope)
   end
 
-  def index
-    @texts_by_type = AttributeHelpText.all_by_scope
-  end
-
   protected
 
   def require_ee_token

app/controllers/auth_sources_controller.rb

@@ -47,6 +47,11 @@ def new
     render 'auth_sources/new'
   end
 
+  def edit
+    @auth_source = AuthSource.find(params[:id])
+    render 'auth_sources/edit'
+  end
+
   def create
     @auth_source = auth_source_class.new permitted_params.auth_source
     if @auth_source.save
@@ -57,11 +62,6 @@ def create
     end
   end
 
-  def edit
-    @auth_source = AuthSource.find(params[:id])
-    render 'auth_sources/edit'
-  end
-
   def update
     @auth_source = AuthSource.find(params[:id])
     updated = permitted_params.auth_source

app/controllers/colors_controller.rb

@@ -53,6 +53,13 @@ def new
     end
   end
 
+  def edit
+    @color = Color.find(params[:id])
+    respond_to do |format|
+      format.html
+    end
+  end
+
   def create
     @color = Color.new(permitted_params.color)
 
@@ -65,13 +72,6 @@ def create
     end
   end
 
-  def edit
-    @color = Color.find(params[:id])
-    respond_to do |format|
-      format.html
-    end
-  end
-
   def update
     @color = Color.find(params[:id])
 

app/controllers/concerns/accounts/user_password_change.rb

@@ -102,8 +102,8 @@ def redirect_if_password_change_not_allowed(user)
   def flash_error_message(log_reason: '', flash_now: true)
     flash_hash = flash_now ? flash.now : flash
 
-    logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip}" \
-                " at #{Time.now.utc}: #{log_reason}"
+    logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} " \
+                "at #{Time.now.utc}: #{log_reason}"
 
     flash_message = yield
 

app/controllers/custom_actions_controller.rb

@@ -45,15 +45,15 @@ def new
     @custom_action = CustomAction.new
   end
 
+  def edit; end
+
   def create
     CustomActions::CreateService
       .new(user: current_user)
       .call(attributes: permitted_params.custom_action.to_h,
             &index_or_render(:new))
   end
 
-  def edit; end
-
   def update
     CustomActions::UpdateService
       .new(action: @custom_action, user: current_user)

app/controllers/custom_fields_controller.rb

@@ -51,6 +51,8 @@ def new
     end
   end
 
+  def edit; end
+
   def create
     call = ::CustomFields::CreateService
       .new(user: current_user)
@@ -66,8 +68,6 @@ def create
     end
   end
 
-  def edit; end
-
   def update
     perform_update(get_custom_field_params)
   end

app/controllers/enumerations_controller.rb

@@ -36,8 +36,6 @@ class EnumerationsController < ApplicationController
 
   def index; end
 
-  def edit; end
-
   def new
     enum_class = enumeration_class(permitted_params.enumeration_type)
     if enum_class
@@ -47,6 +45,8 @@ def new
     end
   end
 
+  def edit; end
+
   def create
     enum_params = permitted_params.enumerations
     type = permitted_params.enumeration_type

app/controllers/errors_controller.rb

@@ -1,4 +1,4 @@
-class ErrorsController < ::ActionController::Base
+class ErrorsController < ActionController::Base
   include ErrorsHelper
   include OpenProjectErrorHelper
   include Accounts::CurrentUser

app/controllers/forums_controller.rb

@@ -86,6 +86,8 @@ def set_topics
 
   def new; end
 
+  def edit; end
+
   def create
     if @forum.save
       flash[:notice] = I18n.t(:notice_successful_create)
@@ -95,8 +97,6 @@ def create
     end
   end
 
-  def edit; end
-
   def update
     if @forum.update(permitted_params.forum)
       flash[:notice] = I18n.t(:notice_successful_update)

app/controllers/messages_controller.rb

@@ -70,6 +70,13 @@ def new
       .result
   end
 
+  # Edit a message
+  def edit
+    return render_403 unless @message.editable_by?(User.current)
+
+    @message.attributes = permitted_params.message(@message)
+  end
+
   # Create a new topic
   def create
     call = create_message(@forum)
@@ -97,13 +104,6 @@ def reply
     redirect_to topic_path(@topic, r: @reply)
   end
 
-  # Edit a message
-  def edit
-    return render_403 unless @message.editable_by?(User.current)
-
-    @message.attributes = permitted_params.message(@message)
-  end
-
   # Edit a message
   def update
     # TODO: move into contract

app/controllers/news_controller.rb

@@ -70,6 +70,8 @@ def new
     @news = News.new(project: @project, author: User.current)
   end
 
+  def edit; end
+
   def create
     @news = News.new(project: @project, author: User.current)
     @news.attributes = permitted_params.news
@@ -81,8 +83,6 @@ def create
     end
   end
 
-  def edit; end
-
   def update
     @news.attributes = permitted_params.news
     if @news.save

app/controllers/oauth/applications_controller.rb

@@ -39,15 +39,15 @@ def index
       @applications = ::Doorkeeper::Application.without_integration.includes(:owner).all
     end
 
-    def new; end
-
-    def edit; end
-
     def show
       @reveal_secret = flash[:reveal_secret]
       flash.delete :reveal_secret
     end
 
+    def new; end
+
+    def edit; end
+
     def create
       call = ::OAuth::PersistApplicationService.new(@application, user: current_user)
                                                .call(permitted_params.oauth_application)

app/controllers/placeholder_users_controller.rb

@@ -68,6 +68,11 @@ def new
       .result
   end
 
+  def edit
+    @membership ||= Member.new
+    @individual_principal = @placeholder_user
+  end
+
   def create
     service = PlaceholderUsers::CreateService.new(user: User.current)
     service_result = service.call(permitted_params.placeholder_user)
@@ -90,11 +95,6 @@ def create
     end
   end
 
-  def edit
-    @membership ||= Member.new
-    @individual_principal = @placeholder_user
-  end
-
   def update
     service_result = PlaceholderUsers::UpdateService
       .new(user: User.current,

app/controllers/repositories_controller.rb

@@ -51,11 +51,29 @@ class RepositoriesController < ApplicationController
 
   rescue_from OpenProject::SCM::Exceptions::SCMError, with: :show_error_command_failed
 
-  def update
-    @repository = @project.repository
-    update_repository(params.fetch(:repository, {}))
+  def show
+    if Setting.autofetch_changesets? && @path.blank?
+      @repository.fetch_changesets
+      @repository.update_required_storage
+    end
 
-    redirect_to project_settings_repository_path(@project)
+    @limit = Setting.repository_truncate_at
+    @entries = @repository.entries(@path, @rev, limit: @limit)
+    @changeset = @repository.find_changeset_by_name(@rev)
+
+    if request.xhr?
+      if @entries && @repository.valid?
+        render(partial: 'dir_list_content')
+      else
+        render(nothing: true)
+      end
+    elsif @entries.nil? && @repository.invalid?
+      show_error_not_found
+    else
+      @changesets = @repository.latest_changesets(@path, @rev)
+      @properties = @repository.properties(@path, @rev)
+      render action: 'show'
+    end
   end
 
   def create
@@ -71,6 +89,13 @@ def create
     redirect_to project_settings_repository_path(@project)
   end
 
+  def update
+    @repository = @project.repository
+    update_repository(params.fetch(:repository, {}))
+
+    redirect_to project_settings_repository_path(@project)
+  end
+
   def committers
     @committers = @repository.committers
     @users = @project.users.to_a
@@ -105,31 +130,6 @@ def destroy
     redirect_to project_settings_repository_path(@project)
   end
 
-  def show
-    if Setting.autofetch_changesets? && @path.blank?
-      @repository.fetch_changesets
-      @repository.update_required_storage
-    end
-
-    @limit = Setting.repository_truncate_at
-    @entries = @repository.entries(@path, @rev, limit: @limit)
-    @changeset = @repository.find_changeset_by_name(@rev)
-
-    if request.xhr?
-      if @entries && @repository.valid?
-        render(partial: 'dir_list_content')
-      else
-        render(nothing: true)
-      end
-    elsif @entries.nil? && @repository.invalid?
-      show_error_not_found
-    else
-      @changesets = @repository.latest_changesets(@path, @rev)
-      @properties = @repository.properties(@path, @rev)
-      render action: 'show'
-    end
-  end
-
   alias_method :browse, :show
 
   def changes