From 1b153d497b6948932b0de2f0088fe7192eb0994a Mon Sep 17 00:00:00 2001 From: William George Date: Thu, 18 Oct 2018 09:06:44 +0000 Subject: Make getting a user by the username case insensitive --- lib/api/helpers.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/api/helpers.rb') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index a7ba8066233..60bf977f0e4 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -96,15 +96,9 @@ module API LabelsFinder.new(current_user, search_params).execute end - # rubocop: disable CodeReuse/ActiveRecord def find_user(id) - if id =~ /^\d+$/ - User.find_by(id: id) - else - User.find_by(username: id) - end + UserFinder.new(id).find_by_id_or_username end - # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord def find_project(id) -- cgit v1.2.1