Auto-correct Cop/LineBreakAroundConditionalBlock violations from rebase

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/helpers/kerberos_spnego_helper.rb

@@ -62,6 +62,7 @@ module KerberosSpnegoHelper
       else
         nil # accept any valid service principal name from keytab
       end
+
     gss.acquire_credentials(gss_service_name) # grab credentials from keytab
 
     # Decode token

app/helpers/merge_requests_helper.rb

@@ -86,6 +86,7 @@ module MergeRequestsHelper
       approvers_names = merge_request.approvers_left.map(&:name)
 
       str <<
+
         if more_approvals > 0
           " (from #{render_items_list(approvers_names + ["#{more_approvals} more"])})"
         elsif more_approvals < 0

app/helpers/milestones_helper.rb

@@ -163,6 +163,7 @@ module MilestonesHelper
 
   def show_burndown_placeholder?(warning)
     return false if cookies['hide_burndown_message'].present?
+
     return false unless @project.feature_available?(:burndown_charts, current_user) &&
         @project.feature_available?(:issue_weights, current_user)
 

ee/app/controllers/ee/admin/groups_controller.rb

@@ -4,6 +4,7 @@ module EE
     module GroupsController
       def reset_runners_minutes
         group
+
         if ClearNamespaceSharedRunnersMinutesService.new(@group).execute
           redirect_to [:admin, @group], notice: 'Group pipeline minutes were successfully reset.'
         else

ee/app/controllers/ee/admin/users_controller.rb

@@ -4,6 +4,7 @@ module EE
     module UsersController
       def reset_runners_minutes
         user
+
         if ClearNamespaceSharedRunnersMinutesService.new(@user.namespace).execute
           redirect_to [:admin, @user], notice: 'User pipeline minutes were successfully reset.'
         else

ee/app/controllers/projects/push_rules_controller.rb

@@ -18,6 +18,7 @@ class Projects::PushRulesController < Projects::ApplicationController
     else
       flash[:alert] = @push_rule.errors.full_messages.join(', ').html_safe
     end
+
     redirect_to_repository_settings(@project)
   end
 

ee/app/controllers/unsubscribes_controller.rb

@@ -13,6 +13,7 @@ class UnsubscribesController < ApplicationController
       @user.admin_unsubscribe!
       Notify.send_unsubscribed_notification(@user.id).deliver_later
     end
+
     redirect_to new_user_session_path, notice: 'You have been unsubscribed'
   end
 

ee/app/helpers/license_helper.rb

@@ -30,6 +30,7 @@ module LicenseHelper
       message << block_changes_message
 
       message <<
+
         if is_admin
           'Upload a new license in the admin area'
         else

ee/app/workers/ldap_group_sync_worker.rb

@@ -21,11 +21,13 @@ class LdapGroupSyncWorker
 
   def sync_group(group, proxy: nil)
     logger.info "Started LDAP group sync for group #{group.name} (#{group.id})"
+
     if proxy
       EE::Gitlab::LDAP::Sync::Group.execute(group, proxy)
     else
       EE::Gitlab::LDAP::Sync::Group.execute_all_providers(group)
     end
+
     logger.info "Finished LDAP group sync for group #{group.name} (#{group.id})"
   end
 end

ee/lib/system_check/geo/http_connection_check.rb

@@ -10,6 +10,7 @@ module SystemCheck
 
       def multi_check
         $stdout.puts
+
         if Gitlab::Geo.primary?
           Gitlab::Geo.secondary_nodes.each do |node|
             $stdout.print "* Can connect to secondary node: '#{node.url}' ... "

lib/api/groups.rb

@@ -256,6 +256,7 @@ module API
         if group.pending_ldap_sync
           LdapGroupSyncWorker.perform_async(group.id)
         end
+
         status 202
       end
     end

lib/tasks/geo.rake

@@ -72,6 +72,7 @@ namespace :geo do
       if Gitlab::Geo::DatabaseTasks.dump_schema_after_migration?
         ns["schema:dump"].invoke
       end
+
       # Allow this task to be called as many times as required. An example is the
       # migrate:redo task, which calls other two internally that depend on this one.
       ns['_dump'].reenable

lib/tasks/gitlab/cleanup.rake

@@ -57,6 +57,7 @@ namespace :gitlab do
         IO.popen(%W(find #{repo_root} -mindepth 1 -maxdepth 2 -name *+moved*.git)) do |find|
           find.each_line do |path|
             path.chomp!
+
             if remove_flag
               if FileUtils.rm_rf(path)
                 puts "Removed...#{path}".color(:green)

lib/tasks/gitlab/elastic.rake

@@ -126,6 +126,7 @@ namespace :gitlab do
         puts 'Index mapping is already up to date'.color(:yellow)
         exit
       end
+
       ####
 
       project_fields = {

spec/ee/spec/features/boards/scoped_issue_board_spec.rb

@@ -507,6 +507,7 @@ describe 'Scoped issue boards', :js do
 
     page.within(".#{filter}") do
       click_button 'Edit'
+
       if value.is_a?(Array)
         value.each { |value| click_link value }
       else

spec/factories/protected_branches.rb

@@ -60,15 +60,19 @@ FactoryBot.define do
       if user = evaluator.authorize_user_to_push
         protected_branch.push_access_levels.new(user: user)
       end
+
       if user = evaluator.authorize_user_to_merge
         protected_branch.merge_access_levels.new(user: user)
       end
+
       if group = evaluator.authorize_group_to_push
         protected_branch.push_access_levels.new(group: group)
       end
+
       if group = evaluator.authorize_group_to_merge
         protected_branch.merge_access_levels.new(group: group)
       end
+
       next unless protected_branch.merge_access_levels.empty?
 
       if evaluator.default_access_level && evaluator.default_push_level

spec/factories/protected_tags.rb

@@ -46,6 +46,7 @@ FactoryBot.define do
       if evaluator.authorize_user_to_create
         protected_tag.create_access_levels.new(user: evaluator.authorize_user_to_create)
       end
+
       if evaluator.authorize_group_to_create
         protected_tag.create_access_levels.new(group: evaluator.authorize_group_to_create)
       end