Enable Style/EmptyLines cop, remove redundant ones

.rubocop.yml

@@ -193,7 +193,7 @@ Style/EmptyLineBetweenDefs:
 
 # Don't use several empty lines in a row.
 Style/EmptyLines:
-  Enabled: false
+  Enabled: true
 
 # Keep blank lines around access modifiers.
 Style/EmptyLinesAroundAccessModifier:

app/controllers/admin/hooks_controller.rb

@@ -22,7 +22,6 @@ class Admin::HooksController < Admin::ApplicationController
     redirect_to admin_hooks_path
   end
 
-
   def test
     @hook = SystemHook.find(params[:hook_id])
     data = {

app/controllers/confirmations_controller.rb

 class ConfirmationsController < Devise::ConfirmationsController
-
   def almost_there
     flash[:notice] = nil
     render layout: "devise_empty"

app/controllers/import/base_controller.rb

 class Import::BaseController < ApplicationController
-
   private
 
   def get_or_create_namespace

app/controllers/import/fogbugz_controller.rb

@@ -5,7 +5,6 @@ class Import::FogbugzController < Import::BaseController
   rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized
 
   def new
-
   end
 
   def callback
@@ -22,7 +21,6 @@ class Import::FogbugzController < Import::BaseController
   end
 
   def new_user_map
-
   end
 
   def create_user_map

app/controllers/import/gitorious_controller.rb

@@ -44,5 +44,4 @@ class Import::GitoriousController < Import::BaseController
   def verify_gitorious_import_enabled
     render_404 unless gitorious_import_enabled?
   end
-
 end

app/controllers/import/google_code_controller.rb

@@ -3,7 +3,6 @@ class Import::GoogleCodeController < Import::BaseController
   before_action :user_map, only: [:new_user_map, :create_user_map]
 
   def new
-
   end
 
   def callback
@@ -34,7 +33,6 @@ class Import::GoogleCodeController < Import::BaseController
   end
 
   def new_user_map
-
   end
 
   def create_user_map

app/controllers/invites_controller.rb

@@ -5,7 +5,6 @@ class InvitesController < ApplicationController
   respond_to :html
 
   def show
-
   end
 
   def accept

app/controllers/projects/issues_controller.rb

@@ -76,7 +76,6 @@ class Projects::IssuesController < Projects::ApplicationController
         render json: @issue.to_json(include: [:milestone, :labels])
       end
     end
-
   end
 
   def create

app/controllers/projects/network_controller.rb

@@ -7,7 +7,6 @@ class Projects::NetworkController < Projects::ApplicationController
   before_action :authorize_download_code!
 
   def show
-
     @url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json))
     @commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s")
 

app/controllers/projects/wikis_controller.rb

@@ -124,5 +124,4 @@ class Projects::WikisController < Projects::ApplicationController
   def wiki_params
     params[:wiki].slice(:title, :content, :format, :message)
   end
-
 end

app/helpers/emails_helper.rb

 module EmailsHelper
-
   # Google Actions
   # https://developers.google.com/gmail/markup/reference/go-to-action
   def email_action(url)

app/helpers/issuables_helper.rb

 module IssuablesHelper
-
   def sidebar_gutter_toggle_icon
     sidebar_gutter_collapsed? ? icon('angle-double-left') : icon('angle-double-right')
   end

app/helpers/search_helper.rb

 module SearchHelper
-
   def search_autocomplete_opts(term)
     return unless current_user
 

app/models/concerns/issuable.rb

@@ -58,7 +58,6 @@ module Issuable
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
-
     delegate :name,
              :email,
              to: :author,

app/models/members/project_member.rb

@@ -15,7 +15,6 @@ class ProjectMember < Member
   before_destroy :delete_member_todos
 
   class << self
-
     # Add users to project teams with passed access option
     #
     # access can be an integer representing a access code

app/models/project_services/bugzilla_service.rb

 class BugzillaService < IssueTrackerService
-
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
 
   def title
@@ -21,5 +20,4 @@ class BugzillaService < IssueTrackerService
   def to_param
     'bugzilla'
   end
-
 end

app/models/project_services/custom_issue_tracker_service.rb

 class CustomIssueTrackerService < IssueTrackerService
-
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
 
   def title
@@ -31,5 +30,4 @@ class CustomIssueTrackerService < IssueTrackerService
       { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' }
     ]
   end
-
 end

app/models/project_services/drone_ci_service.rb

 class DroneCiService < CiService
-
   prop_accessor :drone_url, :token, :enable_ssl_verification
 
   validates :drone_url, presence: true, url: true, if: :activated?

app/models/project_services/issue_tracker_service.rb

 class IssueTrackerService < Service
-
   validates :project_url, :issues_url, :new_issue_url, presence: true, url: true, if: :activated?
 
   default_value_for :category, 'issue_tracker'

app/models/project_services/jira_service.rb

@@ -190,7 +190,6 @@ class JiraService < IssueTrackerService
     end
   end
 
-
   def auth
     require 'base64'
     Base64.urlsafe_encode64("#{self.username}:#{self.password}")

app/models/project_services/redmine_service.rb

 class RedmineService < IssueTrackerService
-
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
 
   def title

app/models/repository.rb

@@ -875,7 +875,6 @@ class Repository
     merge_base(ancestor_id, descendant_id) == ancestor_id
   end
 
-
   def search_files(query, ref)
     offset = 2
     args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref})

app/models/user.rb

@@ -852,7 +852,6 @@ class User < ActiveRecord::Base
                  projects.select(:id),
                  groups.joins(:shared_projects).select(:project_id)]
 
-
     if min_access_level
       scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } }
       relations = [relations.shift] + relations.map { |relation| relation.where(members: scope) }

app/services/create_release_service.rb

@@ -2,7 +2,6 @@ require_relative 'base_service'
 
 class CreateReleaseService < BaseService
   def execute(tag_name, release_description)
-
     repository = project.repository
     existing_tag = repository.find_tag(tag_name)
 

app/services/issues/base_service.rb

 module Issues
   class BaseService < ::IssuableBaseService
-
     def hook_data(issue, action)
       issue_data = issue.to_hook_data(current_user)
       issue_url = Gitlab::UrlBuilder.build(issue)

app/services/merge_requests/base_service.rb

 module MergeRequests
   class BaseService < ::IssuableBaseService
-
     def create_note(merge_request)
       SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
     end

app/services/merge_requests/merge_when_build_succeeds_service.rb

@@ -40,6 +40,5 @@ module MergeRequests
         error("Can't cancel the automatic merge", 406)
       end
     end
-
   end
 end

app/services/milestones/destroy_service.rb

 module Milestones
   class DestroyService < Milestones::BaseService
     def execute(milestone)
-
       Milestone.transaction do
         update_params = { milestone: nil }
 

app/services/projects/download_service.rb

 module Projects
   class DownloadService < BaseService
-
     WHITELIST = [
       /^[^.]+\.fogbugz.com$/
     ]

app/services/projects/import_export/export_service.rb

 module Projects
   module ImportExport
     class ExportService < BaseService
-
       def execute(_options = {})
         @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
         save_all

app/services/system_note_service.rb

@@ -293,7 +293,6 @@ class SystemNoteService
     end
   end
 
-
   def self.cross_reference?(note_text)
     note_text.start_with?(cross_reference_note_prefix)
   end

app/services/update_release_service.rb

@@ -2,7 +2,6 @@ require_relative 'base_service'
 
 class UpdateReleaseService < BaseService
   def execute(tag_name, release_description)
-
     repository = project.repository
     existing_tag = repository.find_tag(tag_name)
 

app/services/wiki_pages/base_service.rb

 module WikiPages
   class BaseService < ::BaseService
-
     def hook_data(page, action)
       hook_data = {
         object_kind: page.class.name.underscore,

config/initializers/1_settings.rb

@@ -96,7 +96,6 @@ class Settings < Settingslogic
   end
 end
 
-
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
 Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
@@ -124,7 +123,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
   end
 end
 
-
 Settings['omniauth'] ||= Settingslogic.new({})
 Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
 Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil?
@@ -218,7 +216,6 @@ Settings.gitlab['restricted_signup_domains'] ||= []
 Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project]
 Settings.gitlab['trusted_proxies'] ||= []
 
-
 #
 # CI
 #
@@ -348,7 +345,6 @@ Settings.git['timeout']   ||= 10
 Settings['satellites'] ||= Settingslogic.new({})
 Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root)
 
-
 #
 # Extra customization
 #

config/routes.rb

@@ -133,7 +133,6 @@ Rails.application.routes.draw do
   #
   resources :notification_settings, only: [:create, :update]
 
-
   #
   # Import
   #
@@ -466,7 +465,6 @@ Rails.application.routes.draw do
   resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
     resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except:
               [:new, :create, :index], path: "/") do
-
       member do
         put :transfer
         delete :remove_fork

features/steps/dashboard/new_project.rb

@@ -49,5 +49,4 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
   step 'I redirected to Google Code import page' do
     expect(current_path).to eq new_import_google_code_path
   end
-
 end

features/steps/explore/projects.rb

@@ -69,7 +69,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
     visit namespace_project_issues_path(public_project.namespace, public_project)
   end
 
-
   step 'I should see list of issues for "Community" project' do
     expect(page).to have_content "Bug"
     expect(page).to have_content public_project.name
@@ -88,7 +87,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
     visit namespace_project_issues_path(internal_project.namespace, internal_project)
   end
 
-
   step 'I should see list of issues for "Internal" project' do
     expect(page).to have_content "Internal Bug"
     expect(page).to have_content internal_project.name
@@ -137,7 +135,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
     @public_project ||= Project.find_by!(name: 'Community')
   end
 
-
   def internal_merge_request
     @internal_merge_request ||= MergeRequest.find_by!(title: 'Feature implemented')
   end

features/steps/project/archived.rb

@@ -33,5 +33,4 @@ class Spinach::Features::ProjectArchived < Spinach::FeatureSteps
   When 'I set project unarchived' do
     click_link "Unarchive"
   end
-
 end

features/steps/project/issues/issues.rb

@@ -124,14 +124,12 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   step 'project "Shop" has milestone "v2.2"' do
-
     milestone = create(:milestone, title: "v2.2", project: project)
 
     3.times { create(:issue, project: project, milestone: milestone) }
   end
 
   step 'project "Shop" has milestone "v3.0"' do
-
     milestone = create(:milestone, title: "v3.0", project: project)
 
     3.times { create(:issue, project: project, milestone: milestone) }
@@ -147,7 +145,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   When 'I select first assignee from "Shop" project' do
-
     first_assignee = project.users.first
     select first_assignee.name, from: "assignee_id"
   end
@@ -160,7 +157,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   step 'project "Shop" have "Release 0.4" open issue' do
-
     create(:issue,
            title: "Release 0.4",
            project: project,
@@ -360,5 +356,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   def filter_issue(text)
     fill_in 'issue_search', with: text
   end
-
 end

features/steps/project/project_find_file.rb

@@ -66,7 +66,6 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
     expect(page).not_to have_content(".gitignore")
   end
 
-
   def find_file(text)
     fill_in 'file_find', with: text
   end

features/steps/shared/issuable.rb

@@ -189,5 +189,4 @@ module SharedIssuable
       expect(page).to have_content content
     end
   end
-
 end

features/steps/snippet_search.rb

@@ -52,5 +52,4 @@ class Spinach::Features::SnippetSearch < Spinach::FeatureSteps
   step 'I should not see "Personal snippet private" in results' do
     expect(page).not_to have_content 'Personal snippet private'
   end
-
 end

lib/api/award_emoji.rb

@@ -11,7 +11,6 @@ module API
         [ ":id/#{awardable_string}/:#{awardable_id_string}/award_emoji",
           ":id/#{awardable_string}/:#{awardable_id_string}/notes/:note_id/award_emoji"
         ].each do |endpoint|
-
           # Get a list of project +awardable+ award emoji
           #
           # Parameters:

lib/api/branches.rb

@@ -40,7 +40,6 @@ module API
       #   PUT /projects/:id/repository/branches/:branch/protect
       put ':id/repository/branches/:branch/protect',
           requirements: { branch: /.+/ } do
-
         authorize_admin_project
 
         @branch = user_project.repository.find_branch(params[:branch])
@@ -60,7 +59,6 @@ module API
       #   PUT /projects/:id/repository/branches/:branch/unprotect
       put ':id/repository/branches/:branch/unprotect',
           requirements: { branch: /.+/ } do
-
         authorize_admin_project
 
         @branch = user_project.repository.find_branch(params[:branch])

lib/api/builds.rb

@@ -13,7 +13,6 @@ module API
       # Example Request:
       #   GET /projects/:id/builds
       get ':id/builds' do
-
         builds = user_project.builds.order('id DESC')
         builds = filter_builds(builds, params[:scope])
 

lib/api/milestones.rb

@@ -115,7 +115,6 @@ module API
         issues = IssuesFinder.new(current_user, finder_params).execute
         present paginate(issues), with: Entities::Issue, current_user: current_user
       end
-
     end
   end
 end

lib/api/project_hooks.rb

@@ -28,7 +28,6 @@ module API
         present @hook, with: Entities::ProjectHook
       end
 
-
       # Add hook to project
       #
       # Parameters:

lib/api/project_members.rb

@@ -4,7 +4,6 @@ module API
     before { authenticate! }
 
     resource :projects do
-
       # Get a project team members
       #
       # Parameters:

lib/api/projects.rb

@@ -341,7 +341,6 @@ module API
         else
           not_found!("Source Project")
         end
-
       end
 
       # Remove a forked_from relationship
@@ -418,7 +417,6 @@ module API
         present paginate(projects), with: Entities::Project
       end
 
-
       # Get a users list
       #
       # Example Request:

lib/api/services.rb

@@ -4,7 +4,6 @@ module API
     before { authenticate! }
     before { authorize_admin_project }
 
-
     resource :projects do
       # Set <service_slug> service for project
       #

lib/banzai/filter/image_link_filter.rb

@@ -8,7 +8,6 @@ module Banzai
       # of the anchor, and then replace the img with the link-wrapped version.
       def call
         doc.xpath('descendant-or-self::img[not(ancestor::a)]').each do |img|
-
           div = doc.document.create_element(
             'div',
             class: 'image-container'

lib/banzai/filter/wiki_link_filter.rb

@@ -8,7 +8,6 @@ module Banzai
     # Context options:
     #   :project_wiki
     class WikiLinkFilter < HTML::Pipeline::Filter
-
       def call
         return doc unless project_wiki?
 

lib/banzai/pipeline/full_pipeline.rb

 module Banzai
   module Pipeline
     class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
-
     end
   end
 end

lib/ci/charts.rb

@@ -13,7 +13,6 @@ module Ci
         collect
       end
 
-
       def push(from, to, format)
         @labels << from.strftime(format)
         @total << project.builds.

lib/disable_email_interceptor.rb

 # Read about interceptors in http://guides.rubyonrails.org/action_mailer_basics.html#intercepting-emails
 class DisableEmailInterceptor
-
   def self.delivering_email(message)
     message.perform_deliveries = false
     Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}"

lib/gitlab/asciidoc.rb

@@ -4,7 +4,6 @@ module Gitlab
   # Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters
   # the resulting HTML through HTML pipeline filters.
   module Asciidoc
-
     DEFAULT_ADOC_ATTRS = [
       'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=gitlab',
       'env-gitlab', 'source-highlighter=html-pipeline'

lib/gitlab/backend/grack_auth.rb

@@ -8,7 +8,6 @@ module Grack
   end
 
   class Auth < Rack::Auth::Basic
-
     attr_accessor :user, :project, :env
 
     def call(env)

lib/gitlab/diff/parser.rb

@@ -40,7 +40,6 @@ module Gitlab
               line_obj_index += 1
             end
 
-
             case line[0]
             when "+"
               line_new += 1

lib/gitlab/import_export/importer.rb

 module Gitlab
   module ImportExport
     class Importer
-
       def initialize(project)
         @archive_file = project.import_source
         @current_user = project.creator

lib/gitlab/import_export/members_mapper.rb

 module Gitlab
   module ImportExport
     class MembersMapper
-
       attr_reader :missing_author_ids
 
       def initialize(exported_members:, user:, project:)

lib/gitlab/import_export/project_creator.rb

 module Gitlab
   module ImportExport
     class ProjectCreator
-
       def initialize(namespace_id, current_user, file, project_path)
         @namespace_id = namespace_id
         @current_user = current_user

lib/gitlab/import_export/project_tree_restorer.rb

 module Gitlab
   module ImportExport
     class ProjectTreeRestorer
-
       def initialize(user:, shared:, project:)
         @path = File.join(shared.export_path, 'project.json')
         @user = user

lib/gitlab/import_export/reader.rb

 module Gitlab
   module ImportExport
     class Reader
-
       attr_reader :tree
 
       def initialize(shared:)
@@ -55,7 +54,6 @@ module Gitlab
         @json_config_hash
       end
 
-
       # If the model is a hash, process the sub_models, which could also be hashes
       # If there is a list, add to an existing array, otherwise use hash syntax
       # +current_key+ main model that will be a key in the hash

lib/gitlab/import_export/relation_factory.rb

 module Gitlab
   module ImportExport
     class RelationFactory
-
       OVERRIDES = { snippets: :project_snippets,
                     pipelines: 'Ci::Pipeline',
                     statuses: 'commit_status',

lib/gitlab/import_export/shared.rb

 module Gitlab
   module ImportExport
     class Shared
-
       attr_reader :errors, :opts
 
       def initialize(opts)

lib/gitlab/import_export/uploads_saver.rb

 module Gitlab
   module ImportExport
     class UploadsSaver
-
       def initialize(project:, shared:)
         @project = project
         @shared = shared