From c8f26592a74e776b9827ed68ccc1ee345ff52408 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 2 Dec 2016 22:01:40 +0000 Subject: [PATCH 1/1] Fix rubocop warnings --- app/controllers/application_controller.rb | 3 +-- app/controllers/export_controller.rb | 3 +-- app/controllers/redactions_controller.rb | 6 ++---- app/controllers/site_controller.rb | 15 +++++---------- .../20150111192335_subscribe_old_changesets.rb | 3 +-- ...11010929_subscribe_authors_to_diary_entries.rb | 3 +-- test/helpers/application_helper_test.rb | 6 ++---- 7 files changed, 13 insertions(+), 26 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2b6d62bb5..09a35beb3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -448,6 +448,5 @@ class ApplicationController < ActionController::Base end # override to stop oauth plugin sending errors - def invalid_oauth_response - end + def invalid_oauth_response; end end diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index bd020f29b..fa7944516 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -22,6 +22,5 @@ class ExportController < ApplicationController end end - def embed - end + def embed; end end diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb index 31dd7273f..129318191 100644 --- a/app/controllers/redactions_controller.rb +++ b/app/controllers/redactions_controller.rb @@ -32,11 +32,9 @@ class RedactionsController < ApplicationController end end - def show - end + def show; end - def edit - end + def edit; end def update # note - don't update the user ID diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 5131629ac..1a4c9f148 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -95,20 +95,15 @@ class SiteController < ApplicationController @locale = params[:copyright_locale] || I18n.locale end - def welcome - end + def welcome; end - def help - end + def help; end - def about - end + def about; end - def export - end + def export; end - def offline - end + def offline; end def preview render :text => RichText.new(params[:format], params[:text]).to_html diff --git a/db/migrate/20150111192335_subscribe_old_changesets.rb b/db/migrate/20150111192335_subscribe_old_changesets.rb index cd0938318..cca8293f5 100644 --- a/db/migrate/20150111192335_subscribe_old_changesets.rb +++ b/db/migrate/20150111192335_subscribe_old_changesets.rb @@ -5,6 +5,5 @@ class SubscribeOldChangesets < ActiveRecord::Migration end end - def down - end + def down; end end diff --git a/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb b/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb index 2dfbbf2c8..3fcbdf5fb 100644 --- a/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb +++ b/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb @@ -5,6 +5,5 @@ class SubscribeAuthorsToDiaryEntries < ActiveRecord::Migration end end - def down - end + def down; end end diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 97b35467b..a25bae99d 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -183,9 +183,7 @@ class ApplicationHelperTest < ActionView::TestCase assert_match %r{^4 months$}, date end - def test_body_class - end + def test_body_class; end - def test_current_page_class - end + def test_current_page_class; end end -- 2.43.2