diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-20 14:16:12 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-20 14:16:12 +0200 |
| commit | e583df544308ff321ce92c79612ff950a4093e79 (patch) | |
| tree | 9327007e545671e4bfd7102ff2369a2f30de357a /app | |
| parent | 74187621ea0297103bd00d1e98c7e01692f64271 (diff) | |
| download | gitlab-ce-e583df544308ff321ce92c79612ff950a4093e79.tar.gz | |
Dont override project_id params when use issues/mr filtering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 770fccaa11b..cb46b5b36e8 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -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 diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 40564c7f889..0792dbf041f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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 |