diff options
Diffstat (limited to 'app/finders/merge_requests_finder/params.rb')
| -rw-r--r-- | app/finders/merge_requests_finder/params.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/finders/merge_requests_finder/params.rb b/app/finders/merge_requests_finder/params.rb index 2c218898dcf..22ebe73abac 100644 --- a/app/finders/merge_requests_finder/params.rb +++ b/app/finders/merge_requests_finder/params.rb @@ -19,5 +19,15 @@ class MergeRequestsFinder end end end + + def merge_user + strong_memoize(:merge_user) do + if merge_user_id? + User.find_by_id(params[:merge_user_id]) + elsif merge_user_username? + User.find_by_username(params[:merge_user_username]) + end + end + end end end |