Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Improve RuboCop rules (compatibility to Code Climate) (#3636)

Browse source 
08f8de84eb/Gemfile.lock (L38)
Code Climate is using RuboCop v0.46.0.

Change several rules to maintain compatibility.
This commit is contained in:
Yamagishi Kazutoshi 2017-06-08 20:24:28 +09:00 • committed by Eugen Rochko
parent 7d2b4186c3
commit 0a0b9a271a
12 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/paginable.rb
View file

@ -6,8 +6,8 @@ module Paginable
included do
scope :paginate_by_max_id, ->(limit, max_id = nil, since_id = nil) {
query = order(arel_table[:id].desc).limit(limit)
query = query.where(arel_table[:id].lt(max_id)) unless max_id.blank?
query = query.where(arel_table[:id].gt(since_id)) unless since_id.blank?
query = query.where(arel_table[:id].lt(max_id)) if max_id.present?
query = query.where(arel_table[:id].gt(since_id)) if since_id.present?
query
}
end

2
app/models/setting.rb
View file

@ -13,7 +13,7 @@
#
class Setting < RailsSettings::Base
source Rails.root.join('config/settings.yml')
source Rails.root.join('config', 'settings.yml')
def to_param
var