Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-27 12:02:20 +0300
committerMarin Jankovski <maxlazio@gmail.com>2014-10-27 12:02:20 +0300
commitd3bdd3ba67dda8b8392770a2b6e4a7473ec4d42d (patch)
tree053f80fead9f002b17caf79d58dc7e14f259e453 /app/finders
parent5e017a4566495b0024ab065e7ceab279ff77e030 (diff)
Do not filter out issues and merge requests related to user right away.
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/issuable_finder.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 56c4f22120d..d0574240511 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -48,7 +48,7 @@ class IssuableFinder
else
[]
end
- elsif current_user && params[:authorized_only].presence
+ elsif current_user && params[:authorized_only].presence && !current_user_related?
klass.of_projects(current_user.authorized_projects).references(:project)
else
klass.of_projects(ProjectsFinder.new.execute(current_user)).references(:project)
@@ -142,4 +142,8 @@ class IssuableFinder
def project
Project.where(id: params[:project_id]).first if params[:project_id].present?
end
+
+ def current_user_related?
+ params[:scope] == 'created-by-me' || params[:scope] == 'authored' || params[:scope] == 'assigned-to-me'
+ end
end