Download as
Browse Code »

Commit fdf7fc044ae1666a0d7dfb9a0022c48dfa3d7231

Authored by Dmitriy Zaporozhets
1 parent ede746bf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Make it possible to assign/mention users from group members

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/controllers/projects_controller.rb
  Diff comments   View file @fdf7fc0
@@ -101,7 +101,7 @@ class ProjectsController < ProjectResourceController @@ -101,7 +101,7 @@ class ProjectsController < ProjectResourceController
101 @suggestions = { 101 @suggestions = {
102 emojis: Emoji.names, 102 emojis: Emoji.names,
103 issues: @project.issues.select([:id, :title, :description]), 103 issues: @project.issues.select([:id, :title, :description]),
104 - members: @project.users.select([:username, :name]).order(:username) 104 + members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
105 } 105 }
106 106
107 respond_to do |format| 107 respond_to do |format|
app/views/merge_requests/_form.html.haml
  Diff comments   View file @fdf7fc0
@@ -40,12 +40,12 @@ @@ -40,12 +40,12 @@
40 = f.label :assignee_id do 40 = f.label :assignee_id do
41 %i.icon-user 41 %i.icon-user
42 Assign to 42 Assign to
43 - .input= f.select(:assignee_id, @project.users.alphabetically.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'}) 43 + .input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
44 .left 44 .left
45 = f.label :milestone_id do 45 = f.label :milestone_id do
46 %i.icon-time 46 %i.icon-time
47 Milestone 47 Milestone
48 - .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) 48 + .input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
49 49
50 .control-group 50 .control-group
51 51