Download as
Browse Code »

Commit abb3121308d6317fdcc103ca463dc7c0cb9077dc

Authored by Dmitriy Zaporozhets
1 parent 13ecbb04
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Show only people who have assigned merge requests in assignee dropdown 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/projects/issues_controller.rb
  Diff comments   View file @abb3121
... ... @@ -28,7 +28,6 @@ class Projects::IssuesController &lt; Projects::ApplicationController
28 28 @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
29 29 sort_param = params[:sort] || 'newest'
30 30 @sort = sort_param.humanize unless sort_param.empty?
31   -
32 31 @assignees = User.where(id: @project.issues.pluck(:assignee_id))
33 32  
34 33 respond_to do |format|
... ...
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @abb3121
... ... @@ -28,6 +28,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
28 28 assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
29 29 @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
30 30 @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
  31 + @assignees = User.where(id: @project.merge_requests.pluck(:assignee_id))
31 32 end
32 33  
33 34 def show
... ...
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @abb3121
... ... @@ -31,7 +31,7 @@
31 31 Any
32 32 = link_to project_filter_path(assignee_id: 0) do
33 33 Unassigned
34   - - @project.team.members.sort_by(&:name).each do |user|
  34 + - @assignees.sort_by(&:name).each do |user|
35 35 %li
36 36 = link_to project_filter_path(assignee_id: user.id) do
37 37 = image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
... ...