BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e583df54
Unverified
Commit
e583df54
authored
Jan 20, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont override project_id params when use issues/mr filtering
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
74187621
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-2
merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-2
No files found.
app/controllers/projects/issues_controller.rb
View file @
e583df54
...
...
@@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController
def
issues_filtered
params
[
:scope
]
=
'all'
if
params
[
:scope
].
blank?
params
[
:state
]
=
'opened'
if
params
[
:state
].
blank?
params
[
:project_id
]
=
@project
.
id
@issues
=
FilteringService
.
new
.
execute
(
Issue
,
current_user
,
params
)
@issues
=
FilteringService
.
new
.
execute
(
Issue
,
current_user
,
params
.
merge
(
project_id:
@project
.
id
))
end
# Since iids are implemented only in 6.1
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
e583df54
...
...
@@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
params
[
:sort
]
||=
'newest'
params
[
:scope
]
=
'all'
if
params
[
:scope
].
blank?
params
[
:state
]
=
'opened'
if
params
[
:state
].
blank?
params
[
:project_id
]
=
@project
.
id
@merge_requests
=
FilteringService
.
new
.
execute
(
MergeRequest
,
current_user
,
params
)
@merge_requests
=
FilteringService
.
new
.
execute
(
MergeRequest
,
current_user
,
params
.
merge
(
project_id:
@project
.
id
)
)
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
]).
per
(
20
)
@sort
=
params
[
:sort
].
humanize
...
...
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