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
12c3962f
Commit
12c3962f
authored
Mar 25, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Search within project.
parent
0a4283b5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+5
-3
No files found.
app/controllers/projects_controller.rb
View file @
12c3962f
...
@@ -136,7 +136,7 @@ class ProjectsController < ApplicationController
...
@@ -136,7 +136,7 @@ class ProjectsController < ApplicationController
emojis:
Emoji
.
names
.
map
{
|
e
|
{
name:
e
,
path:
view_context
.
image_url
(
"emoji/
#{
e
}
.png"
)
}
},
emojis:
Emoji
.
names
.
map
{
|
e
|
{
name:
e
,
path:
view_context
.
image_url
(
"emoji/
#{
e
}
.png"
)
}
},
issues:
@project
.
issues
.
select
([
:iid
,
:title
,
:description
]),
issues:
@project
.
issues
.
select
([
:iid
,
:title
,
:description
]),
mergerequests:
@project
.
merge_requests
.
select
([
:iid
,
:title
,
:description
]),
mergerequests:
@project
.
merge_requests
.
select
([
:iid
,
:title
,
:description
]),
members:
participants
members:
participants
.
uniq
}
}
respond_to
do
|
format
|
respond_to
do
|
format
|
...
@@ -174,8 +174,10 @@ class ProjectsController < ApplicationController
...
@@ -174,8 +174,10 @@ class ProjectsController < ApplicationController
def
participants_in
(
type
,
id
)
def
participants_in
(
type
,
id
)
users
=
case
type
users
=
case
type
when
"Issue"
,
"MergeRequest"
when
"Issue"
type
.
constantize
.
find_by_iid
(
id
).
participants
@project
.
issues
.
find_by_iid
(
id
).
participants
when
"MergeRequest"
@project
.
merge_requests
.
find_by_iid
(
id
).
participants
when
"Commit"
when
"Commit"
author_ids
=
Note
.
for_commit_id
(
id
).
pluck
(
:author_id
).
uniq
author_ids
=
Note
.
for_commit_id
(
id
).
pluck
(
:author_id
).
uniq
User
.
where
(
id:
author_ids
)
User
.
where
(
id:
author_ids
)
...
...
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