vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix rubocop warning (#14288)

Browse source 
* Fix rubocop warning

* use limit variable

* use ContextCreatingMethods option
This commit is contained in:
abcang 2020-07-15 02:05:07 +09:00 • committed by GitHub
parent a8e84a18f1
commit 6a96af4d20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ class Auth::SessionsController < Devise::SessionsController
user = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication
user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication
user ||= User.find_for_authentication(email: user_params[:email])
user
end
end

2
app/controllers/tags_controller.rb
View file

@ -27,7 +27,7 @@ class TagsController < ApplicationController
expires_in 0, public: true
limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
@statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(PAGE_SIZE)
@statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(limit)
@statuses = cache_collection(@statuses, Status)
render xml: RSS::TagSerializer.render(@tag, @statuses)