queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Rubocop offences (#2630)

Browse source 
* disable Bundler/OrderedGems

* fix rubocop Lint/UselessAssignment

* fix rubocop Style/BlockDelimiters

* fix rubocop Style/AlignHash

* fix rubocop Style/AlignParameters, Style/EachWithObject

* fix rubocop Style/SpaceInLambdaLiteral
This commit is contained in:
yhirano 2017-05-01 23:31:02 +09:00 committed by Eugen Rochko
parent 1899cf5f04
commit 3988f2dade
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.rubocop.yml
View file

@ -77,6 +77,9 @@ Style/Lambda:
Rails/HasAndBelongsToMany:
Enabled: false
Bundler/OrderedGems:
Enabled: false
AllCops:
TargetRubyVersion: 2.3
Exclude:

2
app/controllers/auth/sessions_controller.rb
View file

@ -51,7 +51,7 @@ class Auth::SessionsController < Devise::SessionsController
def valid_otp_attempt?(user)
user.validate_and_consume_otp!(user_params[:otp_attempt]) ||
user.invalidate_otp_backup_code!(user_params[:otp_attempt])
rescue OpenSSL::Cipher::CipherError => error
rescue OpenSSL::Cipher::CipherError => _error
false
end

4
app/controllers/concerns/localized.rb
View file

@ -17,9 +17,9 @@ module Localized
end
def default_locale
ENV.fetch('DEFAULT_LOCALE') {
ENV.fetch('DEFAULT_LOCALE') do
user_supplied_locale || I18n.default_locale
}
end
end
def user_supplied_locale

2
app/models/account.rb
View file

@ -329,7 +329,7 @@ class Account < ApplicationRecord
private
def follow_mapping(query, field)
query.pluck(field).inject({}) { |mapping, id| mapping[id] = true; mapping }
query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
end
def avatar_styles(file)

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

@ -4,7 +4,7 @@ module Paginable
extend ActiveSupport::Concern
included do
scope :paginate_by_max_id, -> (limit, max_id = nil, since_id = nil) {
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?