Resolve issuable caching conflicts

app/controllers/concerns/issuable_collections.rb

@@ -15,10 +15,9 @@ module IssuableCollections
     @issues             = issues_collection
     @issues             = @issues.page(params[:page])
     @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
+    @total_pages        = issues_page_count(@issues)
 
-    if @issues.out_of_range? && @issues.total_pages != 0
-      return redirect_to url_for(params.merge(page: @issues.total_pages, only_path: true))
-    end
+    return if redirect_out_of_range(@issues, @total_pages)
 
     if params[:label_name].present?
       @labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute

app/controllers/projects/issues_controller.rb

@@ -26,23 +26,6 @@ class Projects::IssuesController < Projects::ApplicationController
   respond_to :html
 
   def index
-<<<<<<< HEAD
-=======
-    @collection_type    = "Issue"
-    @issues             = issues_collection
-    @issues             = @issues.page(params[:page])
-    @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
-    @total_pages        = issues_page_count(@issues)
-
-    return if redirect_out_of_range(@issues, @total_pages)
-
-    if params[:label_name].present?
-      @labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute
-    end
-
-    @users = []
-
->>>>>>> upstream/master
     if params[:assignee_id].present?
       assignee = User.find_by_id(params[:assignee_id])
       @users.push(assignee) if assignee

app/helpers/issuables_helper.rb

@@ -171,16 +171,6 @@ module IssuablesHelper
     html.html_safe
   end
 
-<<<<<<< HEAD
-  def cached_assigned_issuables_count(assignee, issuable_type, state)
-    cache_key = hexdigest(['assigned_issuables_count', assignee.id, issuable_type, state].join('-'))
-    Rails.cache.fetch(cache_key, expires_in: 2.minutes) do
-      assigned_issuables_count(assignee, issuable_type, state)
-    end
-  end
-
-=======
->>>>>>> upstream/master
   def issuable_first_contribution_icon
     content_tag(:span, class: 'fa-stack') do
       concat(icon('certificate', class: "fa-stack-2x"))