Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
fdf7fc04
Commit
fdf7fc04
authored
Jun 22, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it possible to assign/mention users from group members
parent
ede746bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/views/merge_requests/_form.html.haml
app/views/merge_requests/_form.html.haml
+2
-2
No files found.
app/controllers/projects_controller.rb
View file @
fdf7fc04
...
@@ -101,7 +101,7 @@ class ProjectsController < ProjectResourceController
...
@@ -101,7 +101,7 @@ class ProjectsController < ProjectResourceController
@suggestions
=
{
@suggestions
=
{
emojis:
Emoji
.
names
,
emojis:
Emoji
.
names
,
issues:
@project
.
issues
.
select
([
:id
,
:title
,
:description
]),
issues:
@project
.
issues
.
select
([
:id
,
:title
,
:description
]),
members:
@project
.
users
.
select
([
:username
,
:name
]).
order
(
:username
)
members:
@project
.
team
.
members
.
sort_by
(
&
:username
).
map
{
|
user
|
{
username:
user
.
username
,
name:
user
.
name
}
}
}
}
respond_to
do
|
format
|
respond_to
do
|
format
|
...
...
app/views/merge_requests/_form.html.haml
View file @
fdf7fc04
...
@@ -40,12 +40,12 @@
...
@@ -40,12 +40,12 @@
=
f
.
label
:assignee_id
do
=
f
.
label
:assignee_id
do
%i
.icon-user
%i
.icon-user
Assign to
Assign to
.input
=
f
.
select
(
:assignee_id
,
@project
.
users
.
alphabetically
.
collect
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.input
=
f
.
select
(
:assignee_id
,
@project
.
team
.
members
.
sort_by
(
&
:name
).
map
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.left
.left
=
f
.
label
:milestone_id
do
=
f
.
label
:milestone_id
do
%i
.icon-time
%i
.icon-time
Milestone
Milestone
.input
=
f
.
select
(
:milestone_id
,
@project
.
milestones
.
active
.
all
.
collect
{
|
p
|
[
p
.
title
,
p
.
id
]
},
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.input
=
f
.
select
(
:milestone_id
,
@project
.
milestones
.
active
.
all
.
map
{
|
p
|
[
p
.
title
,
p
.
id
]
},
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.control-group
.control-group
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment