Remove consecutive blank lines

2019-06-22 15:34:27 +02:00
parent 47b2c42a1d
commit 488461b8ac
36 changed files with 3 additions and 40 deletions
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -26,6 +26,9 @@ Layout/IndentationConsistency:
 Layout/IndentationWidth:
  Enabled: true

+Layout/EmptyLines:
+  Enabled: true
+
 Layout/EndOfLine:
  EnforcedStyle: lf

--- a/app/controllers/admin/poll/active_polls_controller.rb
+++ b/app/controllers/admin/poll/active_polls_controller.rb
@@ -22,7 +22,6 @@ class Admin::Poll::ActivePollsController < Admin::Poll::BaseController
    end
  end

-
  private

    def load_active_poll
--- a/app/controllers/dashboard/supports_controller.rb
+++ b/app/controllers/dashboard/supports_controller.rb
@@ -15,7 +15,6 @@ class Dashboard::SupportsController < Dashboard::BaseController
      accumulate_supports(grouped_votes)
    end

-
    def supports
      @supports ||= Vote
                    .where(votable: proposal,
--- a/app/controllers/legislation/processes_controller.rb
+++ b/app/controllers/legislation/processes_controller.rb
@@ -10,7 +10,6 @@ class Legislation::ProcessesController < Legislation::BaseController
  before_action :set_random_seed, only: :proposals
  before_action :check_past, only: :resume

-
  def index
    @current_filter ||= "open"
    @processes = ::Legislation::Process.send(@current_filter).published
--- a/app/models/poll/pair_answer.rb
+++ b/app/models/poll/pair_answer.rb
@@ -18,7 +18,6 @@ class Poll::PairAnswer < ApplicationRecord
  validates :answer_right, inclusion: { in: ->(a) { a.question.question_answers.visibles }},
            unless: ->(a) { a.question.blank? }

-
  scope :by_author, ->(author_id) { where(author_id: author_id) }
  scope :by_question, ->(question_id) { where(question_id: question_id) }

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -358,7 +358,6 @@ class User < ApplicationRecord
    followables.compact.map { |followable| followable.tags.map(&:name) }.flatten.compact.uniq
  end

-
  def self.current_user
    Thread.current[:user]
  end
--- a/app/models/votation_type.rb
+++ b/app/models/votation_type.rb
@@ -110,7 +110,6 @@ class VotationType < ApplicationRecord
      end
    end

-
    result
  end

--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -49,7 +49,6 @@
            <% end %>
          </div>

-
          <% if @account.email.present? %>
            <h2><%= t("account.show.notifications")%></h2>

--- a/app/views/admin/budget_investments/_investments.html.erb
+++ b/app/views/admin/budget_investments/_investments.html.erb
@@ -1,6 +1,5 @@
 <a class="small float-right clear" data-open="download-modal"><%= t("admin.budget_investments.index.download_current_selection") %></a>

-
 <% if params[:advanced_filters].include?("winners") %>
  <% if display_calculate_winners_button?(@budget) %>
    <%= link_to calculate_winner_button_text(@budget),
--- a/app/views/admin/budget_investments/edit.html.erb
+++ b/app/views/admin/budget_investments/edit.html.erb
@@ -127,7 +127,6 @@
                     label: t("admin.budget_investments.edit.milestone_tags") %>
    </div>

-
    <div class="small-12 column margin-top">
      <%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
    </div>
--- a/app/views/admin/hidden_comments/index.html.erb
+++ b/app/views/admin/hidden_comments/index.html.erb
@@ -1,7 +1,6 @@
 <h2><%= t("admin.hidden_comments.index.title") %></h2>
 <p><%= t("admin.shared.moderated_content") %></p>

-
 <%= render "shared/filter_subnav", i18n_namespace: "admin.hidden_comments.index" %>

 <% if @comments.any? %>
--- a/app/views/admin/hidden_debates/index.html.erb
+++ b/app/views/admin/hidden_debates/index.html.erb
@@ -1,7 +1,6 @@
 <h2><%= t("admin.hidden_debates.index.title") %></h2>
 <p><%= t("admin.shared.moderated_content") %></p>

-
 <%= render "shared/filter_subnav", i18n_namespace: "admin.hidden_debates.index" %>

 <% if @debates.any? %>
--- a/app/views/admin/signature_sheets/show.html.erb
+++ b/app/views/admin/signature_sheets/show.html.erb
@@ -18,7 +18,6 @@
  <%= simple_format @signature_sheet.required_fields_to_verify %>
 </div>

-
 <div id="verified_signatures" class="callout success">
  <strong>
    <%= t("admin.signature_sheets.show.verified",
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -11,7 +11,6 @@
  <% end %>
 </div>

-
 <div id="users">
  <%= render "users" %>
 </div>
--- a/app/views/officing/results/index.html.erb
+++ b/app/views/officing/results/index.html.erb
@@ -8,7 +8,6 @@
    </h3>
  </div>

-
  <div class="row">
    <div class="small-12 medium-9 column">
      <table>
--- a/app/views/stats/index.html.erb
+++ b/app/views/stats/index.html.erb
@@ -58,7 +58,6 @@
          </p>
        </div>

-
    </div>
  </div>
 </div>
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -37,7 +37,6 @@
    <% end %>
  </div>

-
  <div class="tabs-content" data-tabs-content="topics-tabs">
    <%= render "topics/filter_subnav" %>
    <div class="tabs-panel is-active" id="tab-comments">
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -28,7 +28,6 @@

      <%= f.email_field :email,     placeholder: t("devise_views.users.registrations.new.email_label") %>

-
      <%= f.password_field :password, autocomplete: "off",
                           placeholder: t("devise_views.users.registrations.new.password_label") %>

--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -18,7 +18,6 @@
 <main>
  <%= render "feeds" %>

-
  <div class="row">
    <% if @cards.any? %>
      <div class="small-12 column <%= "large-8" if feed_processes_enabled? %>">
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -52,7 +52,6 @@ namespace :deploy do

  after :finishing, "deploy:cleanup"

-
  desc "Deploys and runs the tasks needed to upgrade to a new release"
  task :upgrade do
    after "add_new_settings", "execute_release_tasks"
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -48,7 +48,6 @@ Rails.application.configure do
  # config.action_cable.url = 'wss://example.com/cable'
  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]

-
  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
  config.force_ssl = true

--- a/lib/email_digest.rb
+++ b/lib/email_digest.rb
@@ -14,7 +14,6 @@ class EmailDigest
    notifications.any?
  end

-
  def deliver(run_at)
    if valid_email? && pending_notifications?
      Mailer.delay(run_at: run_at).proposal_notification_digest(user, notifications.to_a)
--- a/spec/controllers/legislation/annotations_controller_spec.rb
+++ b/spec/controllers/legislation/annotations_controller_spec.rb
@@ -16,7 +16,6 @@ describe Legislation::AnnotationsController do
                                                             title: "Final version") }
    let(:user) { create(:user, :level_two) }

-
    it "creates an ahoy event" do
      sign_in user

--- a/spec/features/admin/admin_notifications_spec.rb
+++ b/spec/features/admin/admin_notifications_spec.rb
@@ -98,7 +98,6 @@ describe "Admin Notifications" do
        click_link "Edit"
      end

-
      fill_in_admin_notification_form(segment_recipient: "All users",
                                      title: "Other title",
                                      body: "Other body",
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -687,7 +687,6 @@ describe "Admin budget investments" do
                                 administrator: administrator)
      create(:budget_investment, budget: budget, title: "More hospitals")

-
      visit admin_budget_budget_investments_path(budget_id: budget.id)

      expect(page).to have_css(".budget_investment", count: 3)
@@ -767,7 +766,6 @@ describe "Admin budget investments" do
                                 administrator: administrator)
      create(:budget_investment, budget: budget, title: "More hostals")

-
      visit admin_budget_budget_investments_path(budget_id: budget.id)

      expect(page).to have_css(".budget_investment", count: 4)
@@ -1884,7 +1882,6 @@ describe "Admin budget investments" do
      expect(cookie_value).to eq("id,supports,admin,geozone," +
        "feasibility,valuation_finished,visible_to_valuators,selected,incompatible,author")

-
      visit admin_budget_budget_investments_path(budget)

      cookies = page.driver.browser.manage.all_cookies
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -286,7 +286,6 @@ describe "Admin budgets" do
      expect(page).not_to have_content unselected.title
      expect(page).not_to have_content selected.title

-
      visit edit_admin_budget_path(budget)
      expect(page).to have_content "See results"
    end
--- a/spec/features/budget_polls/budgets_spec.rb
+++ b/spec/features/budget_polls/budgets_spec.rb
@@ -32,7 +32,6 @@ describe "Admin Budgets" do
                      name_en: "Budget for climate change",
                      name_fr: "Budget pour le changement climatique")

-
      visit admin_budgets_path
      select("Français", from: "locale-switcher")

--- a/spec/features/legislation/resume_spec.rb
+++ b/spec/features/legislation/resume_spec.rb
@@ -75,8 +75,6 @@ describe "Legislation" do
      @debate = create(:legislation_question, process: @process, title: "Question 2")
      create(:debate_comment, user: user, commentable_id: @debate.id, body: "Answer 3")
      create(:debate_comment, user: user, commentable_id: @debate.id, body: "Answer 4")
-
-
    end

    scenario "show debates list" do
--- a/spec/features/polls/votation_type_spec.rb
+++ b/spec/features/polls/votation_type_spec.rb
@@ -367,5 +367,4 @@ describe "Poll Votation Type" do
    end
  end

-
 end
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -547,7 +547,6 @@ describe "Valuation budget investments" do
      investment = create(:budget_investment, budget: budget)
      investment.valuators << [valuator]

-
      login_as(admin.user)
      visit valuation_budget_budget_investment_path(budget, investment)
      click_link "Edit dossier"
--- a/spec/features/welcome_spec.rb
+++ b/spec/features/welcome_spec.rb
@@ -121,5 +121,4 @@ describe "Welcome screen" do
    Setting["feature.user.skip_verification"] = nil
  end

-
 end
--- a/spec/helpers/signature_sheets_helper_spec.rb
+++ b/spec/helpers/signature_sheets_helper_spec.rb
@@ -77,6 +77,4 @@ describe SignatureSheetsHelper do

  end

-
-
 end
--- a/spec/models/budget/heading_spec.rb
+++ b/spec/models/budget/heading_spec.rb
@@ -168,7 +168,6 @@ describe Budget::Heading do
    end
  end

-
  describe "save longitude" do

    it "Doesn't allow longitude < -180" do
@@ -267,7 +266,6 @@ describe Budget::Heading do
    end
  end

-
  describe "heading" do
    it "can be deleted if no budget's investments associated" do
      heading1 = create(:budget_heading, group: group, name: "name")
--- a/spec/models/dashboard/action_spec.rb
+++ b/spec/models/dashboard/action_spec.rb
@@ -279,7 +279,6 @@ describe Dashboard::Action do
        let!(:resource) { create(:dashboard_action, :resource, :active, day_offset: 0,
                                                     published_proposal: true) }

-
        it "when proposal has been created today and day_offset is valid only for today" do
          expect(described_class.detect_new_actions_since(Date.yesterday,
                                                          proposal)).to include(resource.id)
--- a/spec/models/legislation/process/phase_spec.rb
+++ b/spec/models/legislation/process/phase_spec.rb
@@ -20,7 +20,6 @@ RSpec.describe Legislation::Process::Phase, type: :model do
      expect(process.draft_phase.enabled?).to be false
    end

-
    it "checks allegations phase" do
      expect(process.allegations_phase.enabled?).to be true

--- a/spec/models/poll/pair_answer_spec.rb
+++ b/spec/models/poll/pair_answer_spec.rb
@@ -72,7 +72,6 @@ describe Poll::PairAnswer do

  end

-
  describe "#generate_pair" do
    let(:user) { create(:user) }
    let(:question) { create(:poll_question) }