Download as
Browse Code »

Commit 66d0db2e238cd3d94354772d7fe21e3f1d9ec7f2

Authored by Dmitriy Zaporozhets
2 parents c308b7be e583df54
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'bug/500_pagination' into 'master' 

Fix 500 error on project issues and merge requests pages
Showing 4 changed files with 6 additions and 8 deletions   Show diff stats
@@ -63,7 +63,7 @@ gem "stamp" @@ -63,7 +63,7 @@ gem "stamp"
63 gem 'enumerize' 63 gem 'enumerize'
64 64
65 # Pagination 65 # Pagination
66 -gem "kaminari", "~> 0.14.1" 66 +gem "kaminari", "~> 0.15.1"
67 67
68 # HAML 68 # HAML
69 gem "haml-rails" 69 gem "haml-rails"
@@ -259,7 +259,7 @@ GEM @@ -259,7 +259,7 @@ GEM
259 json (1.8.1) 259 json (1.8.1)
260 jwt (0.1.8) 260 jwt (0.1.8)
261 multi_json (>= 1.5) 261 multi_json (>= 1.5)
262 - kaminari (0.14.1) 262 + kaminari (0.15.1)
263 actionpack (>= 3.0.0) 263 actionpack (>= 3.0.0)
264 activesupport (>= 3.0.0) 264 activesupport (>= 3.0.0)
265 kgio (2.8.1) 265 kgio (2.8.1)
@@ -281,7 +281,7 @@ GEM @@ -281,7 +281,7 @@ GEM
281 minitest (4.7.5) 281 minitest (4.7.5)
282 modernizr (2.6.2) 282 modernizr (2.6.2)
283 sprockets (~> 2.0) 283 sprockets (~> 2.0)
284 - multi_json (1.8.2) 284 + multi_json (1.8.4)
285 multi_xml (0.5.5) 285 multi_xml (0.5.5)
286 multipart-post (1.2.0) 286 multipart-post (1.2.0)
287 mysql2 (0.3.11) 287 mysql2 (0.3.11)
@@ -600,7 +600,7 @@ DEPENDENCIES @@ -600,7 +600,7 @@ DEPENDENCIES
600 jquery-rails (= 2.1.3) 600 jquery-rails (= 2.1.3)
601 jquery-turbolinks 601 jquery-turbolinks
602 jquery-ui-rails (= 2.0.2) 602 jquery-ui-rails (= 2.0.2)
603 - kaminari (~> 0.14.1) 603 + kaminari (~> 0.15.1)
604 launchy 604 launchy
605 letter_opener 605 letter_opener
606 minitest (~> 4.7.0) 606 minitest (~> 4.7.0)
app/controllers/projects/issues_controller.rb
  Diff comments   View file @66d0db2
@@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController @@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController
118 def issues_filtered 118 def issues_filtered
119 params[:scope] = 'all' if params[:scope].blank? 119 params[:scope] = 'all' if params[:scope].blank?
120 params[:state] = 'opened' if params[:state].blank? 120 params[:state] = 'opened' if params[:state].blank?
121 - params[:project_id] = @project.id  
122 - @issues = FilteringService.new.execute(Issue, current_user, params) 121 + @issues = FilteringService.new.execute(Issue, current_user, params.merge(project_id: @project.id))
123 end 122 end
124 123
125 # Since iids are implemented only in 6.1 124 # Since iids are implemented only in 6.1
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @66d0db2
@@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController @@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
20 params[:sort] ||= 'newest' 20 params[:sort] ||= 'newest'
21 params[:scope] = 'all' if params[:scope].blank? 21 params[:scope] = 'all' if params[:scope].blank?
22 params[:state] = 'opened' if params[:state].blank? 22 params[:state] = 'opened' if params[:state].blank?
23 - params[:project_id] = @project.id  
24 23
25 - @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params) 24 + @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params.merge(project_id: @project.id))
26 @merge_requests = @merge_requests.page(params[:page]).per(20) 25 @merge_requests = @merge_requests.page(params[:page]).per(20)
27 26
28 @sort = params[:sort].humanize 27 @sort = params[:sort].humanize