Adds Rubocop rule for line break around conditionals

51 files changed, 73 insertions, 0 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index d6ce368efd5..6134ad2bfc7 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -26,6 +26,7 @@ module API
       check_unmodified_since!(last_updated)
 
       status 204
+
       if block_given?
         yield resource
       else
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 8bf53939751..063f0d6599c 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -103,6 +103,7 @@ module API
         elsif params[:user_id]
           user = User.find_by(id: params[:user_id])
         end
+
         present user, with: Entities::UserSafe
       end
 
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 7aa10631d53..c99fe3ab5b3 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -175,6 +175,7 @@ module API
         issue = ::Issues::CreateService.new(user_project,
                                             current_user,
                                             issue_params.merge(request: request, api: true)).execute
+
         if issue.spam?
           render_api_error!({ error: 'Spam detected' }, 400)
         end
diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb
index 74b3376a1f3..675c963bae2 100644
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
@@ -48,6 +48,7 @@ module API
                                                      current_user,
                                                      declared_params(include_missing: false))
                            .execute(:api, ignore_skip_ci: true, save_on_errors: false)
+
         if new_pipeline.persisted?
           present new_pipeline, with: Entities::Pipeline
         else
diff --git a/lib/api/project_snippets.rb b/lib/api/project_snippets.rb
index 2ccda1c1aa1..5bed58c2d63 100644
--- a/lib/api/project_snippets.rb
+++ b/lib/api/project_snippets.rb
@@ -13,6 +13,7 @@ module API
           if errors[:project_access].any?
             error!(errors[:project_access], 422)
           end
+
           not_found!
         end
 
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index fa222bf2b1c..653126e79ea 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -154,6 +154,7 @@ module API
           if project.errors[:limit_reached].present?
             error!(project.errors[:limit_reached], 403)
           end
+
           render_validation_error!(project)
         end
       end
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 4f36bbd760f..9638c53a1df 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -15,6 +15,7 @@ module API
           if errors[:project_access].any?
             error!(errors[:project_access], 422)
           end
+
           not_found!
         end
 
diff --git a/lib/api/v3/members.rb b/lib/api/v3/members.rb
index 684860b553e..de226e4e573 100644
--- a/lib/api/v3/members.rb
+++ b/lib/api/v3/members.rb
@@ -67,6 +67,7 @@ module API
             unless member
               member = source.add_user(params[:user_id], params[:access_level], current_user: current_user, expires_at: params[:expires_at])
             end
+
             if member.persisted? && member.valid?
               present member.user, with: ::API::Entities::Member, member: member
             else
diff --git a/lib/api/v3/merge_requests.rb b/lib/api/v3/merge_requests.rb
index 1d6d823f32b..0a24fea52a3 100644
--- a/lib/api/v3/merge_requests.rb
+++ b/lib/api/v3/merge_requests.rb
@@ -126,6 +126,7 @@ module API
             if status == :deprecated
               detail DEPRECATION_MESSAGE
             end
+
             success ::API::V3::Entities::MergeRequest
           end
           get path do
diff --git a/lib/api/v3/project_snippets.rb b/lib/api/v3/project_snippets.rb
index c41fee32610..6ba425ba8c7 100644
--- a/lib/api/v3/project_snippets.rb
+++ b/lib/api/v3/project_snippets.rb
@@ -14,6 +14,7 @@ module API
             if errors[:project_access].any?
               error!(errors[:project_access], 422)
             end
+
             not_found!
           end
 
diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb
index 7c260b8d910..446f804124b 100644
--- a/lib/api/v3/projects.rb
+++ b/lib/api/v3/projects.rb
@@ -41,6 +41,7 @@ module API
             # private or internal, use the more conservative option, private.
             attrs[:visibility_level] = (publik == true) ? Gitlab::VisibilityLevel::PUBLIC : Gitlab::VisibilityLevel::PRIVATE
           end
+
           attrs
         end
 
@@ -201,6 +202,7 @@ module API
             if project.errors[:limit_reached].present?
               error!(project.errors[:limit_reached], 403)
             end
+
             render_validation_error!(project)
           end
         end
diff --git a/lib/api/v3/repositories.rb b/lib/api/v3/repositories.rb
index f9a47101e27..5b54734bb45 100644
--- a/lib/api/v3/repositories.rb
+++ b/lib/api/v3/repositories.rb
@@ -14,6 +14,7 @@ module API
             if errors[:project_access].any?
               error!(errors[:project_access], 422)
             end
+
             not_found!
           end
         end
diff --git a/lib/api/v3/snippets.rb b/lib/api/v3/snippets.rb
index 126ec72248e..85613c8ed84 100644
--- a/lib/api/v3/snippets.rb
+++ b/lib/api/v3/snippets.rb
@@ -97,6 +97,7 @@ module API
           attrs = declared_params(include_missing: false)
 
           UpdateSnippetService.new(nil, current_user, snippet, attrs).execute
+
           if snippet.persisted?
             present snippet, with: ::API::Entities::PersonalSnippet
           else
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index d97e5d98229..5e6828de597 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -31,6 +31,7 @@ module Backup
             pgsql_args << "-n"
             pgsql_args << Gitlab.config.backup.pg_schema
           end
+
           spawn('pg_dump', *pgsql_args, config['database'], out: compress_wr)
         end
       compress_wr.close
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 2a04c03919d..6715159a1aa 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -47,6 +47,7 @@ module Backup
 
         if File.exist?(path_to_wiki_repo)
           progress.print " * #{display_repo_path(wiki)} ... "
+
           if empty_repo?(wiki)
             progress.puts " [SKIPPED]".color(:cyan)
           else
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index e25916528f4..35eadf6fa93 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -148,6 +148,7 @@ module Gitlab
             stream.seek(@offset)
             append = @offset > 0
           end
+
           start_offset = @offset
 
           open_new_tag
@@ -155,6 +156,7 @@ module Gitlab
           stream.each_line do |line|
             s = StringScanner.new(line)
             until s.eos?
+
               if s.scan(Gitlab::Regex.build_trace_section_regex)
                 handle_section(s)
               elsif s.scan(/\e([@-_])(.*?)([@-~])/)
@@ -168,6 +170,7 @@ module Gitlab
               else
                 @out << s.scan(/./m)
               end
+
               @offset += s.matched_size
             end
           end
@@ -236,8 +239,10 @@ module Gitlab
             if @style_mask & STYLE_SWITCHES[:bold] != 0
               fg_color.sub!(/fg-([a-z]{2,}+)/, 'fg-l-\1')
             end
+
             css_classes << fg_color
           end
+
           css_classes << @bg_color unless @bg_color.nil?
 
           STYLE_SWITCHES.each do |css_class, flag|
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 7b35c24d153..592a1956ceb 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -512,6 +512,7 @@ module Gitlab
         batch_size: 10_000,
         interval: 10.minutes
       )
+
         unless relation.model < EachBatch
           raise TypeError, 'The relation must include the EachBatch module'
         end
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
index d32616862f0..979225dd216 100644
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
@@ -26,6 +26,7 @@ module Gitlab
               move_repository(project, old_full_path, new_full_path)
               move_repository(project, "#{old_full_path}.wiki", "#{new_full_path}.wiki")
             end
+
             move_uploads(old_full_path, new_full_path) unless project.hashed_storage?(:attachments)
             move_pages(old_full_path, new_full_path)
           end
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index b669ee5b799..0f897e6316c 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -14,6 +14,7 @@ module Gitlab
         else
           @diff_lines = diff_lines
         end
+
         @raw_lines = @diff_lines.map(&:text)
       end
 
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 37face8e7d0..d3b49b1ec75 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -156,12 +156,14 @@ module Gitlab
         %W[git apply --3way #{patch_path}]
       ) do |output, status|
         puts output
+
         unless status.zero?
           @failed_files = output.lines.reduce([]) do |memo, line|
             if line.start_with?('error: patch failed:')
               file = line.sub(/\Aerror: patch failed: /, '')
               memo << file unless file =~ IGNORED_FILES_REGEX
             end
+
             memo
           end
 
diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb
index e2f7c1d0257..3436306e122 100644
--- a/lib/gitlab/email/handler/create_merge_request_handler.rb
+++ b/lib/gitlab/email/handler/create_merge_request_handler.rb
@@ -10,6 +10,7 @@ module Gitlab
 
         def initialize(mail, mail_key)
           super(mail, mail_key)
+
           if m = /\A([^\+]*)\+merge-request\+(.*)/.match(mail_key.to_s)
             @project_path, @incoming_email_token = m.captures
           end
diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index 5e426b13ade..8953bc8c148 100644
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
@@ -112,6 +112,7 @@ module Gitlab
           [bug['sCategory'], bug['sPriority']].each do |label|
             unless label.blank?
               labels << label
+
               unless @known_labels.include?(label)
                 create_label(label)
                 @known_labels << label
@@ -265,6 +266,7 @@ module Gitlab
         if content.blank?
           content = '*(No description has been entered for this issue)*'
         end
+
         body << content
 
         body.join("\n\n")
@@ -278,6 +280,7 @@ module Gitlab
         if content.blank?
           content = "*(No comment has been entered for this change)*"
         end
+
         body << content
 
         if updates.any?
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index f371adfa109..6ada9a145db 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -668,6 +668,7 @@ module Gitlab
             end
           end
         end
+
         @refs_hash
       end
 
diff --git a/lib/gitlab/git/storage/forked_storage_check.rb b/lib/gitlab/git/storage/forked_storage_check.rb
index 1307f400700..0a4e557b59b 100644
--- a/lib/gitlab/git/storage/forked_storage_check.rb
+++ b/lib/gitlab/git/storage/forked_storage_check.rb
@@ -27,6 +27,7 @@ module Gitlab
           status = nil
 
           while status.nil?
+
             if deadline > Time.now.utc
               sleep(wait_time)
               _pid, status = Process.wait2(filesystem_check_pid, Process::WNOHANG)
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index ae1753ff0ae..37ba1af8d6f 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -52,6 +52,7 @@ module Gitlab
         )
         response = GitalyClient.call(@repository.storage, :operation_service,
           :user_create_branch, request)
+
         if response.pre_receive_error.present?
           raise Gitlab::Git::HooksService::PreReceiveError.new(response.pre_receive_error)
         end
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index ab38c0c3e34..46b49128140 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -302,6 +302,7 @@ module Gitlab
           else
             "#{project.namespace.full_path}/#{name}##{id}"
           end
+
         text = "~~#{text}~~" if deleted
         text
       end
@@ -329,6 +330,7 @@ module Gitlab
         if content.blank?
           content = "*(No comment has been entered for this change)*"
         end
+
         body << content
 
         if updates.any?
@@ -352,6 +354,7 @@ module Gitlab
         if content.blank?
           content = "*(No description has been entered for this issue)*"
         end
+
         body << content
 
         if attachments.any?
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb
index c518943be59..4b5f9f3a926 100644
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -148,6 +148,7 @@ module Gitlab
         else
           relation_hash = relation_item[sub_relation.to_s]
         end
+
         [relation_hash, sub_relation]
       end
 
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 05dbaf6322c..cb711a83433 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -267,6 +267,7 @@ module Gitlab
                             else
                               %w[title group_id]
                             end
+
         finder_hash = parsed_relation_hash.slice(*finder_attributes)
 
         if label?
diff --git a/lib/gitlab/kubernetes/helm/pod.rb b/lib/gitlab/kubernetes/helm/pod.rb
index 233f6bf6227..97ad3c97e95 100644
--- a/lib/gitlab/kubernetes/helm/pod.rb
+++ b/lib/gitlab/kubernetes/helm/pod.rb
@@ -14,6 +14,7 @@ module Gitlab
             generate_config_map
             spec['volumes'] = volumes_specification
           end
+
           ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
         end
 
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb
index 0d9a554fc18..cde60addcf7 100644
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -42,6 +42,7 @@ module Gitlab
         else
           self.class.invalid_provider(provider)
         end
+
         @options = config_for(@provider) # Use @provider, not provider
       end
 
diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb
index 877cebf6786..ef44a13df51 100644
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
@@ -169,6 +169,7 @@ module Gitlab
               end
             end
           end
+
           @pool
         end
       end
diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb
index fee741b47be..cc1e92480be 100644
--- a/lib/gitlab/middleware/multipart.rb
+++ b/lib/gitlab/middleware/multipart.rb
@@ -47,6 +47,7 @@ module Gitlab
             else
               value = decorate_params_value(value, @request.params[key], tmp_path)
             end
+
             @request.update_param(key, value)
           end
 
@@ -60,6 +61,7 @@ module Gitlab
           unless path_hash.is_a?(Hash) && path_hash.count == 1
             raise "invalid path: #{path_hash.inspect}"
           end
+
           path_key, path_value = path_hash.first
 
           unless value_hash.is_a?(Hash) && value_hash[path_key]
diff --git a/lib/gitlab/multi_collection_paginator.rb b/lib/gitlab/multi_collection_paginator.rb
index c22d0a84860..43921a8c1c0 100644
--- a/lib/gitlab/multi_collection_paginator.rb
+++ b/lib/gitlab/multi_collection_paginator.rb
@@ -37,6 +37,7 @@ module Gitlab
                  else
                    per_page - first_collection_last_page_size
                  end
+
         hash[page] = second_collection.page(second_collection_page)
                        .per(per_page - paginated_first_collection(page).size)
                        .padding(offset)
diff --git a/lib/gitlab/quick_actions/extractor.rb b/lib/gitlab/quick_actions/extractor.rb
index 3ebfa3bd4b8..c0878a34fb1 100644
--- a/lib/gitlab/quick_actions/extractor.rb
+++ b/lib/gitlab/quick_actions/extractor.rb
@@ -126,6 +126,7 @@ module Gitlab
             command << match_data[1] unless match_data[1].empty?
             commands << command
           end
+
           content = substitution.perform_substitution(self, content)
         end
 
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index 8ad06480575..4178b436acf 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -24,6 +24,7 @@ module Gitlab
             # the pool will be used in a multi-threaded context
             size += Sidekiq.options[:concurrency]
           end
+
           size
         end
 
@@ -104,6 +105,7 @@ module Gitlab
             db_numbers = queries["db"] if queries.key?("db")
             config[:db] = db_numbers[0].to_i if db_numbers.any?
           end
+
           config
         else
           redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(redis_url)
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index ca48c6df602..70b639501fd 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -115,6 +115,7 @@ module Gitlab
         else
           merge_requests.full_search(query)
         end
+
       merge_requests.order('updated_at DESC')
     end
 
diff --git a/lib/gitlab/storage_check/cli.rb b/lib/gitlab/storage_check/cli.rb
index 04bf1bf1d26..9b64c8e033a 100644
--- a/lib/gitlab/storage_check/cli.rb
+++ b/lib/gitlab/storage_check/cli.rb
@@ -59,9 +59,11 @@ module Gitlab
         if response.skipped_shards.any?
           warnings << "Skipped shards: #{response.skipped_shards.join(', ')}"
         end
+
         if response.failing_shards.any?
           warnings << "Failing shards: #{response.failing_shards.join(', ')}"
         end
+
         logger.warn(warnings.join(' - ')) if warnings.any?
       end
     end
diff --git a/lib/gitlab/testing/request_blocker_middleware.rb b/lib/gitlab/testing/request_blocker_middleware.rb
index 4a8e3c2eee0..53333b9b06b 100644
--- a/lib/gitlab/testing/request_blocker_middleware.rb
+++ b/lib/gitlab/testing/request_blocker_middleware.rb
@@ -37,12 +37,14 @@ module Gitlab
 
       def call(env)
         increment_active_requests
+
         if block_requests?
           block_request(env)
         else
           sleep 0.2 if slow_requests?
           @app.call(env)
         end
+
       ensure
         decrement_active_requests
       end
diff --git a/lib/gitlab/timeless.rb b/lib/gitlab/timeless.rb
index b290c716f97..76a1808c8ac 100644
--- a/lib/gitlab/timeless.rb
+++ b/lib/gitlab/timeless.rb
@@ -9,6 +9,7 @@ module Gitlab
       else
         block.call
       end
+
     ensure
       model.record_timestamps = original_record_timestamps
     end
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index 961df0468a4..3b64cb32afa 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -12,6 +12,7 @@ module Gitlab
         puts "You are using the latest GitLab version"
       else
         puts "Newer GitLab version is available"
+
         answer = if ARGV.first == "-y"
                    "yes"
                  else
@@ -77,6 +78,7 @@ module Gitlab
       update_commands.each do |title, cmd|
         puts title
         puts " -> #{cmd.join(' ')}"
+
         if system(env, *cmd)
           puts " -> OK"
         else
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index ce6d0422c1f..0de183858aa 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -42,6 +42,7 @@ module Gitlab
                           else
                             raise "Unsupported action: #{action}"
                           end
+
         if feature_enabled
           params[:GitalyServer] = server
         end
diff --git a/lib/system_check/simple_executor.rb b/lib/system_check/simple_executor.rb
index 8b145fb4511..d268f501b4a 100644
--- a/lib/system_check/simple_executor.rb
+++ b/lib/system_check/simple_executor.rb
@@ -66,6 +66,7 @@ module SystemCheck
 
         if check.can_repair?
           $stdout.print 'Trying to fix error automatically. ...'
+
           if check.repair!
             $stdout.puts 'Success'.color(:green)
             return
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 9dcf44fdc3e..2383bcf954b 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -46,6 +46,7 @@ namespace :gitlab do
             puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.color(:yellow)
             sleep(5)
           end
+
           # Drop all tables Load the schema to ensure we don't have any newer tables
           # hanging out from a failed upgrade
           $progress.puts 'Cleaning the database ... '.color(:blue)
@@ -222,6 +223,7 @@ namespace :gitlab do
 
       task restore: :environment do
         $progress.puts "Restoring container registry images ... ".color(:blue)
+
         if Gitlab.config.registry.enabled
           Backup::Registry.new.restore
           $progress.puts "done".color(:green)
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 903e84359cd..31cd6bfe6e1 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -180,6 +180,7 @@ namespace :gitlab do
         puts "can't check, you have no projects".color(:magenta)
         return
       end
+
       puts ""
 
       Project.find_each(batch_size: 100) do |project|
@@ -210,6 +211,7 @@ namespace :gitlab do
       gitlab_shell_repo_base = gitlab_shell_path
       check_cmd = File.expand_path('bin/check', gitlab_shell_repo_base)
       puts "Running #{check_cmd}"
+
       if system(check_cmd, chdir: gitlab_shell_repo_base)
         puts 'gitlab-shell self-check successful'.color(:green)
       else
@@ -285,6 +287,7 @@ namespace :gitlab do
       return if process_count.zero?
 
       print 'Number of Sidekiq processes ... '
+
       if process_count == 1
         puts '1'.color(:green)
       else
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index eb0f757aea7..04d56509ac6 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -84,6 +84,7 @@ namespace :gitlab do
         next unless user.ldap_user?
 
         print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
+
         if Gitlab::LDAP::Access.allowed?(user)
           puts " [OK]".color(:green)
         else
diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake
index ba221e44e5d..77c28615856 100644
--- a/lib/tasks/gitlab/dev.rake
+++ b/lib/tasks/gitlab/dev.rake
@@ -14,6 +14,7 @@ namespace :gitlab do
             puts "Must specify a branch as an argument".color(:red)
             exit 1
           end
+
           args
         end
 
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 4507b841964..a2e68c0471b 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -5,9 +5,11 @@ namespace :gitlab do
       require 'toml'
 
       warn_user_is_not_gitlab
+
       unless args.dir.present?
         abort %(Please specify the directory where you want to install gitaly:\n  rake "gitlab:gitaly:install[/home/git/gitaly]")
       end
+
       args.with_defaults(repo: 'https://gitlab.com/gitlab-org/gitaly.git')
 
       version = Gitlab::GitalyClient.expected_server_version
diff --git a/lib/tasks/gitlab/list_repos.rake b/lib/tasks/gitlab/list_repos.rake
index b732db9db6e..d7f28691098 100644
--- a/lib/tasks/gitlab/list_repos.rake
+++ b/lib/tasks/gitlab/list_repos.rake
@@ -8,6 +8,7 @@ namespace :gitlab do
       namespace_ids = Namespace.where(['updated_at > ?', date]).pluck(:id).sort
       scope = scope.where('id IN (?) OR namespace_id in (?)', project_ids, namespace_ids)
     end
+
     scope.find_each do |project|
       base = File.join(project.repository_storage_path, project.disk_path)
       puts base + '.git'
diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake
index f44abc2b81b..a25f7ce59c7 100644
--- a/lib/tasks/gitlab/update_templates.rake
+++ b/lib/tasks/gitlab/update_templates.rake
@@ -10,6 +10,7 @@ namespace :gitlab do
       puts "This rake task is not meant fo production instances".red
       exit(1)
     end
+
     admin = User.find_by(admin: true)
 
     unless admin
diff --git a/lib/tasks/gitlab/workhorse.rake b/lib/tasks/gitlab/workhorse.rake
index e7ac0b5859f..308ffb0e284 100644
--- a/lib/tasks/gitlab/workhorse.rake
+++ b/lib/tasks/gitlab/workhorse.rake
@@ -3,9 +3,11 @@ namespace :gitlab do
     desc "GitLab | Install or upgrade gitlab-workhorse"
     task :install, [:dir, :repo] => :environment do |t, args|
       warn_user_is_not_gitlab
+
       unless args.dir.present?
         abort %(Please specify the directory where you want to install gitlab-workhorse:\n  rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]")
       end
+
       args.with_defaults(repo: 'https://gitlab.com/gitlab-org/gitlab-workhorse.git')
 
       version = Gitlab::Workhorse.version
diff --git a/lib/tasks/migrate/migrate_iids.rake b/lib/tasks/migrate/migrate_iids.rake
index fc2cea8c016..aa2d01730d7 100644
--- a/lib/tasks/migrate/migrate_iids.rake
+++ b/lib/tasks/migrate/migrate_iids.rake
@@ -4,6 +4,7 @@ task migrate_iids: :environment do
   Issue.where(iid: nil).find_each(batch_size: 100) do |issue|
     begin
       issue.set_iid
+
       if issue.update_attribute(:iid, issue.iid)
         print '.'
       else
@@ -19,6 +20,7 @@ task migrate_iids: :environment do
   MergeRequest.where(iid: nil).find_each(batch_size: 100) do |mr|
     begin
       mr.set_iid
+
       if mr.update_attribute(:iid, mr.iid)
         print '.'
       else
@@ -34,6 +36,7 @@ task migrate_iids: :environment do
   Milestone.where(iid: nil).find_each(batch_size: 100) do |m|
     begin
       m.set_iid
+
       if m.update_attribute(:iid, m.iid)
         print '.'
       else