Merge pull request #1746 from consul/rubocop/rails_fixes
Rubocop fixes 🤖: Rails edition 💎🛤
This commit is contained in:
@@ -9,7 +9,7 @@ class Management::BaseController < ActionController::Base
|
||||
private
|
||||
|
||||
def verify_manager
|
||||
raise ActionController::RoutingError.new('Not Found') unless current_manager.present?
|
||||
raise ActionController::RoutingError.new('Not Found') if current_manager.blank?
|
||||
end
|
||||
|
||||
def current_manager
|
||||
|
||||
@@ -6,7 +6,7 @@ class SandboxController < ApplicationController
|
||||
helper_method(:namespace)
|
||||
|
||||
def index
|
||||
@templates = Dir.glob(Rails.root.join('app/views/sandbox/*.html.erb').to_s).map do |filename|
|
||||
@templates = Dir.glob(Rails.root.join('app', 'views', 'sandbox', '*.html.erb').to_s).map do |filename|
|
||||
filename = File.basename(filename, File.extname(filename))
|
||||
filename unless filename.starts_with?('_') || filename == 'index.html'
|
||||
end.compact
|
||||
|
||||
@@ -3,7 +3,7 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
|
||||
# new action, PATCH does not exist in the default Devise::ConfirmationsController
|
||||
# PATCH /resource/confirmation
|
||||
def update
|
||||
self.resource = resource_class.find_by_confirmation_token(params[:confirmation_token])
|
||||
self.resource = resource_class.find_by(confirmation_token: params[:confirmation_token])
|
||||
|
||||
if resource.encrypted_password.blank?
|
||||
resource.assign_attributes(resource_params)
|
||||
@@ -27,7 +27,7 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
|
||||
def show
|
||||
# In the default implementation, this already confirms the resource:
|
||||
# self.resource = self.resource = resource_class.confirm_by_token(params[:confirmation_token])
|
||||
self.resource = resource_class.find_by_confirmation_token(params[:confirmation_token])
|
||||
self.resource = resource_class.find_by(confirmation_token: params[:confirmation_token])
|
||||
|
||||
yield resource if block_given?
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
|
||||
end
|
||||
|
||||
def check_username
|
||||
if User.find_by_username params[:username]
|
||||
if User.find_by username: params[:username]
|
||||
render json: {available: false, message: t("devise_views.users.registrations.new.username_is_not_available")}
|
||||
else
|
||||
render json: {available: true, message: t("devise_views.users.registrations.new.username_is_available")}
|
||||
|
||||
@@ -58,9 +58,7 @@ class Poll::Question < ActiveRecord::Base
|
||||
end
|
||||
end
|
||||
|
||||
def answerable_by?(user)
|
||||
poll.answerable_by?(user)
|
||||
end
|
||||
delegate :answerable_by?, to: :poll
|
||||
|
||||
def self.answerable_by(user)
|
||||
return none if user.nil? || user.unverified?
|
||||
|
||||
Reference in New Issue
Block a user