mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-13 14:46:05 +10:00
Show only people who have assigned merge requests in assignee dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
@@ -28,7 +28,6 @@ class Projects::IssuesController < Projects::ApplicationController
|
||||
@milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
|
||||
sort_param = params[:sort] || 'newest'
|
||||
@sort = sort_param.humanize unless sort_param.empty?
|
||||
|
||||
@assignees = User.where(id: @project.issues.pluck(:assignee_id))
|
||||
|
||||
respond_to do |format|
|
||||
|
||||
@@ -28,6 +28,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||
assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
|
||||
@assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
|
||||
@milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
|
||||
@assignees = User.where(id: @project.merge_requests.pluck(:assignee_id))
|
||||
end
|
||||
|
||||
def show
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
Any
|
||||
= link_to project_filter_path(assignee_id: 0) do
|
||||
Unassigned
|
||||
- @project.team.members.sort_by(&:name).each do |user|
|
||||
- @assignees.sort_by(&:name).each do |user|
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: user.id) do
|
||||
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
|
||||
|
||||
Reference in New Issue
Block a user