summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2019-07-24 07:46:39 +0200
committerHans de Graaff <graaff@gentoo.org>2019-07-24 07:46:39 +0200
commit98b87fbd2aada2bac80ad3d76b699ff32e8fd809 (patch)
tree618e0179a9c3a9a7d38da52313237482458d8511
parentSilence a deprecation warning (diff)
downloadglsamaker-98b87fbd2aada2bac80ad3d76b699ff32e8fd809.tar.gz
glsamaker-98b87fbd2aada2bac80ad3d76b699ff32e8fd809.tar.bz2
glsamaker-98b87fbd2aada2bac80ad3d76b699ff32e8fd809.zip
Fix rubocop Layout/TrailingBlankLines
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
-rw-r--r--.rubocop_todo.yml7
-rw-r--r--Capfile2
-rw-r--r--Rakefile2
-rw-r--r--app/controllers/admin/index_controller.rb2
-rw-r--r--app/controllers/admin/users_controller.rb2
-rw-r--r--app/controllers/bugs_controller.rb2
-rw-r--r--app/helpers/admin/templates_helper.rb2
-rw-r--r--app/helpers/glsa_helper.rb1
-rw-r--r--app/indices/indices.rb2
-rw-r--r--app/models/cpe.rb2
-rw-r--r--app/models/cve.rb2
-rw-r--r--app/models/cve_assignment.rb2
-rw-r--r--app/models/cve_change.rb2
-rw-r--r--app/models/cve_comment.rb2
-rw-r--r--app/models/cve_reference.rb2
-rw-r--r--config/initializers/glsamaker-global.rb2
-rw-r--r--config/initializers/mime_types.rb2
-rw-r--r--db/migrate/20110226204724_add_release_flag_to_revisions.rb2
-rw-r--r--lib/authorization.rb2
-rw-r--r--lib/glsamaker/spelling.rb2
-rw-r--r--lib/kramdown_ext.rb2
-rw-r--r--lib/tasks/rcov.rake1
-rw-r--r--test/test_helper.rb2
23 files changed, 20 insertions, 29 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b3272d9..e265d63 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -393,13 +393,6 @@ Layout/Tab:
Exclude:
- 'app/views/glsa/_glsa.xml.builder'
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
- Enabled: false
-
# Offense count: 286
# Cop supports --auto-correct.
# Configuration parameters: AllowInHeredoc.
diff --git a/Capfile b/Capfile
index e04728e..1a98f3c 100644
--- a/Capfile
+++ b/Capfile
@@ -1,4 +1,4 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy' # remove this line to skip loading any of the default tasks \ No newline at end of file
+load 'config/deploy' # remove this line to skip loading any of the default tasks
diff --git a/Rakefile b/Rakefile
index 5e70529..463f2f4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,4 +9,4 @@ Glsamaker::Application.load_tasks
begin
require 'ci/reporter/rake/test_unit'
rescue LoadError
-end \ No newline at end of file
+end
diff --git a/app/controllers/admin/index_controller.rb b/app/controllers/admin/index_controller.rb
index 16f01f5..ac48bfb 100644
--- a/app/controllers/admin/index_controller.rb
+++ b/app/controllers/admin/index_controller.rb
@@ -3,4 +3,4 @@ class Admin::IndexController < ApplicationController
def index
end
-end \ No newline at end of file
+end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index ef3bd04..d43628d 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -68,4 +68,4 @@ class Admin::UsersController < ApplicationController
flash[:notice] = "User was successfully deleted."
redirect_to(admin_users_path)
end
-end \ No newline at end of file
+end
diff --git a/app/controllers/bugs_controller.rb b/app/controllers/bugs_controller.rb
index 54142e0..5e5c6d9 100644
--- a/app/controllers/bugs_controller.rb
+++ b/app/controllers/bugs_controller.rb
@@ -56,4 +56,4 @@ class BugsController < ApplicationController
def show
end
-end \ No newline at end of file
+end
diff --git a/app/helpers/admin/templates_helper.rb b/app/helpers/admin/templates_helper.rb
index 9266e69..6f30e51 100644
--- a/app/helpers/admin/templates_helper.rb
+++ b/app/helpers/admin/templates_helper.rb
@@ -3,4 +3,4 @@ module Admin::TemplatesHelper
def target_list
GLSAMAKER_TEMPLATE_TARGETS.map{|x| [x.titleize, x]}
end
-end \ No newline at end of file
+end
diff --git a/app/helpers/glsa_helper.rb b/app/helpers/glsa_helper.rb
index 64171b8..7770227 100644
--- a/app/helpers/glsa_helper.rb
+++ b/app/helpers/glsa_helper.rb
@@ -198,4 +198,3 @@ private
end
end
end
-
diff --git a/app/indices/indices.rb b/app/indices/indices.rb
index cc3596a..04be101 100644
--- a/app/indices/indices.rb
+++ b/app/indices/indices.rb
@@ -31,4 +31,4 @@ ThinkingSphinx::Index.define :revision, :with => :active_record do
indexes is_release
has glsa_id, revid, release_revision
-end \ No newline at end of file
+end
diff --git a/app/models/cpe.rb b/app/models/cpe.rb
index a683c7a..243cced 100644
--- a/app/models/cpe.rb
+++ b/app/models/cpe.rb
@@ -26,4 +26,4 @@ class Cpe < ActiveRecord::Base
def version
split[4]
end
-end \ No newline at end of file
+end
diff --git a/app/models/cve.rb b/app/models/cve.rb
index 665eac1..d9a05c6 100644
--- a/app/models/cve.rb
+++ b/app/models/cve.rb
@@ -174,4 +174,4 @@ class Cve < ActiveRecord::Base
package_hints.flatten.uniq
end
-end \ No newline at end of file
+end
diff --git a/app/models/cve_assignment.rb b/app/models/cve_assignment.rb
index 19d471f..af1559a 100644
--- a/app/models/cve_assignment.rb
+++ b/app/models/cve_assignment.rb
@@ -1,3 +1,3 @@
class CveAssignment < ActiveRecord::Base
belongs_to :cve
-end \ No newline at end of file
+end
diff --git a/app/models/cve_change.rb b/app/models/cve_change.rb
index c40fa7c..71ff974 100644
--- a/app/models/cve_change.rb
+++ b/app/models/cve_change.rb
@@ -1,4 +1,4 @@
class CveChange < ActiveRecord::Base
belongs_to :user, :class_name => "User", :foreign_key => "user_id"
belongs_to :cve
-end \ No newline at end of file
+end
diff --git a/app/models/cve_comment.rb b/app/models/cve_comment.rb
index 4c6b8c1..73357dc 100644
--- a/app/models/cve_comment.rb
+++ b/app/models/cve_comment.rb
@@ -1,4 +1,4 @@
class CveComment < ActiveRecord::Base
belongs_to :cve
belongs_to :user, :class_name => "User", :foreign_key => "user_id"
-end \ No newline at end of file
+end
diff --git a/app/models/cve_reference.rb b/app/models/cve_reference.rb
index 7fd8ea8..1f11e01 100644
--- a/app/models/cve_reference.rb
+++ b/app/models/cve_reference.rb
@@ -1,3 +1,3 @@
class CveReference < ActiveRecord::Base
belongs_to :cve
-end \ No newline at end of file
+end
diff --git a/config/initializers/glsamaker-global.rb b/config/initializers/glsamaker-global.rb
index 9a0ba3b..8f85b00 100644
--- a/config/initializers/glsamaker-global.rb
+++ b/config/initializers/glsamaker-global.rb
@@ -1,2 +1,2 @@
# The fields that templates can be applied on
-GLSAMAKER_TEMPLATE_TARGETS = %w[ title synopsis description impact workaround resolution ] \ No newline at end of file
+GLSAMAKER_TEMPLATE_TARGETS = %w[ title synopsis description impact workaround resolution ]
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 6fa84d7..5f94d03 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -4,4 +4,4 @@
# Mime::Type.register "text/richtext", :rtf
# Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register "text/plain", :txt \ No newline at end of file
+Mime::Type.register "text/plain", :txt
diff --git a/db/migrate/20110226204724_add_release_flag_to_revisions.rb b/db/migrate/20110226204724_add_release_flag_to_revisions.rb
index f7f4c71..43d0b6d 100644
--- a/db/migrate/20110226204724_add_release_flag_to_revisions.rb
+++ b/db/migrate/20110226204724_add_release_flag_to_revisions.rb
@@ -8,4 +8,4 @@ class AddReleaseFlagToRevisions < ActiveRecord::Migration
remove_column :revisions, :release_revision
remove_column :revisions, :is_release
end
-end \ No newline at end of file
+end
diff --git a/lib/authorization.rb b/lib/authorization.rb
index b611c92..5341709 100644
--- a/lib/authorization.rb
+++ b/lib/authorization.rb
@@ -46,4 +46,4 @@ module Authorization
def log_unauthorized_access(msg)
logger.warn "[#{Time.now.rfc2822}] UNAUTHORIZED ACCESS by #{current_user.login} from #{request.remote_ip} to #{request.url}: #{msg}"
end
-end \ No newline at end of file
+end
diff --git a/lib/glsamaker/spelling.rb b/lib/glsamaker/spelling.rb
index 0d06310..cc30cc8 100644
--- a/lib/glsamaker/spelling.rb
+++ b/lib/glsamaker/spelling.rb
@@ -45,4 +45,4 @@ module Glsamaker
end
end
end
-end \ No newline at end of file
+end
diff --git a/lib/kramdown_ext.rb b/lib/kramdown_ext.rb
index 33df756..e41013e 100644
--- a/lib/kramdown_ext.rb
+++ b/lib/kramdown_ext.rb
@@ -17,4 +17,4 @@ module Kramdown
end
end
end
-end \ No newline at end of file
+end
diff --git a/lib/tasks/rcov.rake b/lib/tasks/rcov.rake
index 45349a9..bb602e4 100644
--- a/lib/tasks/rcov.rake
+++ b/lib/tasks/rcov.rake
@@ -79,4 +79,3 @@ namespace :test do
end
end
end
-
diff --git a/test/test_helper.rb b/test/test_helper.rb
index cef2b00..317d547 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -45,4 +45,4 @@ class ActiveSupport::TestCase
def assert_access_denied(message = nil)
assert_redirected_to({:controller => '/index', :action => 'error', :type => 'access'}, message)
end
-end \ No newline at end of file
+end