IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 04:03:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove use of deprecated methods (#19486)

Browse Source
This commit is contained in:
Rafael dos Santos Silva 2022-12-15 22:08:05 -03:00 committed by GitHub
parent 98e3e90aa2
commit 4edeb7d9eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -252,7 +252,7 @@ class User < ActiveRecord::Base
end end
scope :filter_by_username_or_email, ->(filter) do scope :filter_by_username_or_email, ->(filter) do
if filter =~ /.+@.+/ if filter.is_a?(String) && filter =~ /.+@.+/
# probably an email so try the bypass # probably an email so try the bypass
if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id) if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id)
return where('users.id = ?', user_id) return where('users.id = ?', user_id)

2
spec/lib/stylesheet/manager_spec.rb
View File

@ -929,7 +929,7 @@ RSpec.describe Stylesheet::Manager do
after do after do
path = Stylesheet::Manager.send(:manifest_full_path) path = Stylesheet::Manager.send(:manifest_full_path)
File.delete(path) if File.exists?(path) File.delete(path) if File.exist?(path)
end end
it "returns a hash" do it "returns a hash" do