diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/finders/issuable_finder | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
| download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/finders/issuable_finder')
| -rw-r--r-- | app/finders/issuable_finder/params.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/finders/issuable_finder/params.rb b/app/finders/issuable_finder/params.rb index 5b48d0817e3..8a194f34f74 100644 --- a/app/finders/issuable_finder/params.rb +++ b/app/finders/issuable_finder/params.rb @@ -110,7 +110,9 @@ class IssuableFinder def group strong_memoize(:group) do - if params[:group_id].present? + if params[:group_id].is_a?(Group) + params[:group_id] + elsif params[:group_id].present? Group.find(params[:group_id]) else nil |