Merge branch 'dev_military' of http://git.trustie.net/jasder/forgeplus into dev_military

app/controllers/projects_controller.rb

@@ -11,10 +11,10 @@ class ProjectsController < ApplicationController
     scope = Projects::ListQuery.call(params)
 
     # @projects = kaminari_paginate(scope)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, :members, owner: :user_extension)
+    @projects = kaminari_paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, :members, owner: :user_extension)
 
     category_id = params[:category_id]
-    @total_count =
+    @total_count = @projects.total_count
       if category_id.blank?
         ps = ProjectStatistic.first
         ps.common_projects_count + ps.mirror_projects_count unless ps.blank?