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
Léo-Paul Géneau
gitlab-ce
Commits
a7b572d0
Commit
a7b572d0
authored
Dec 22, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #2333
parent
8fe58ed5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/roles/account.rb
app/roles/account.rb
+1
-1
No files found.
app/controllers/groups_controller.rb
View file @
a7b572d0
...
@@ -21,7 +21,7 @@ class GroupsController < ApplicationController
...
@@ -21,7 +21,7 @@ class GroupsController < ApplicationController
# Get authored or assigned open merge requests
# Get authored or assigned open merge requests
def
merge_requests
def
merge_requests
@merge_requests
=
current_user
.
cared_merge_requests
@merge_requests
=
current_user
.
cared_merge_requests
.
opened
@merge_requests
=
@merge_requests
.
of_group
(
@group
).
recent
.
page
(
params
[
:page
]).
per
(
20
)
@merge_requests
=
@merge_requests
.
of_group
(
@group
).
recent
.
page
(
params
[
:page
]).
per
(
20
)
end
end
...
...
app/roles/account.rb
View file @
a7b572d0
...
@@ -47,7 +47,7 @@ module Account
...
@@ -47,7 +47,7 @@ module Account
end
end
def
cared_merge_requests
def
cared_merge_requests
MergeRequest
.
where
(
"author_id = :id or assignee_id = :id"
,
id:
self
.
id
)
.
opened
MergeRequest
.
where
(
"author_id = :id or assignee_id = :id"
,
id:
self
.
id
)
end
end
def
project_ids
def
project_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