From 2246883e60cb9abfb9d14a6390bef0e0a1fbd883 Mon Sep 17 00:00:00 2001
From: ArtOfCode- <hello@artofcode.co.uk>
Date: Wed, 1 Jul 2020 22:24:17 +0100
Subject: [PATCH] Rubocop
---
app/controllers/tags_controller.rb | 4 ++--
app/models/application_record.rb | 4 ++--
app/models/tag.rb | 2 +-
app/models/tag_with_path.rb | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 35705a7e2..415481277 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -31,8 +31,8 @@ class TagsController < ApplicationController
@count = @tags.count
table = params[:hierarchical].present? ? 'tags_paths' : 'tags'
@tags = @tags.left_joins(:posts).group(Arel.sql("#{table}.id"))
- .select(Arel.sql("#{table}.*, COUNT(posts.id) AS post_count"))
- .paginate(per_page: 96, page: params[:page])
+ .select(Arel.sql("#{table}.*, COUNT(posts.id) AS post_count"))
+ .paginate(per_page: 96, page: params[:page])
end
def show
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index d65fc384a..59bb7dbca 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -43,11 +43,11 @@ class ApplicationRecord < ActiveRecord::Base
return unless block_given?
transaction do
- connection.execute "SET @old_sql_mode = @@sql_mode"
+ connection.execute 'SET @old_sql_mode = @@sql_mode'
connection.execute "SET SESSION sql_mode = REPLACE(REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY,', ''), " \
"'ONLY_FULL_GROUP_BY', '')"
yield
- connection.execute "SET SESSION sql_mode = @old_sql_mode"
+ connection.execute 'SET SESSION sql_mode = @old_sql_mode'
end
end
end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 51bf767f3..66a44621c 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -25,7 +25,7 @@ class Tag < ApplicationRecord
def parent_chain
Enumerator.new do |enum|
parent_group = group
- while parent_group != nil
+ until parent_group.nil?
enum.yield parent_group
parent_group = parent_group.group
end
diff --git a/app/models/tag_with_path.rb b/app/models/tag_with_path.rb
index dde39913a..44df998e2 100644
--- a/app/models/tag_with_path.rb
+++ b/app/models/tag_with_path.rb
@@ -1,3 +1,3 @@
class TagWithPath < Tag
self.table_name = 'tags_paths'
-end
\ No newline at end of file
+end
--
GitLab