post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix some rubocop style issues (#5730)

Browse source
This commit is contained in:
Eugen Rochko 2017-11-17 02:06:26 +01:00 • committed by Yamagishi Kazutoshi
parent 2151fd3150
commit 3e90987c8b
7 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -104,7 +104,7 @@ class ApplicationController < ActionController::Base
unless uncached_ids.empty?
uncached = klass.where(id: uncached_ids).with_includes.map { |item| [item.id, item] }.to_h
uncached.values.each do |item|
uncached.each_value do |item|
Rails.cache.write(item.cache_key, item)
end
end

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

@ -62,7 +62,7 @@ class Auth::SessionsController < Devise::SessionsController
if user_params[:otp_attempt].present? && session[:otp_user_id]
authenticate_with_two_factor_via_otp(user)
elsif user && user.valid_password?(user_params[:password])
elsif user&.valid_password?(user_params[:password])
prompt_for_two_factor(user)
end
end