Commit 8c90d212 authored by Clement Ho's avatar Clement Ho

Merge branch '3553-epics-list' of gitlab.com:gitlab-org/gitlab-ee into 3553-epics-list

parents 74ed5688 4f599491
...@@ -9,6 +9,7 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -9,6 +9,7 @@ class Groups::EpicsController < Groups::ApplicationController
skip_before_action :labels skip_before_action :labels
def index def index
set_default_state
@epics = @issuables @epics = @issuables
respond_to do |format| respond_to do |format|
...@@ -65,4 +66,10 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -65,4 +66,10 @@ class Groups::EpicsController < Groups::ApplicationController
def preload_for_collection def preload_for_collection
@preload_for_collection ||= [:group, :author] @preload_for_collection ||= [:group, :author]
end end
# we need to override the default state which is opened for now because we don't have
# states for epics and need all as default for navigation to work correctly
def set_default_state
params[:state] = 'all'
end
end end
...@@ -22,8 +22,7 @@ class EpicsFinder < IssuableFinder ...@@ -22,8 +22,7 @@ class EpicsFinder < IssuableFinder
# we don't have states for epics for now but need counts for all and opened # we don't have states for epics for now but need counts for all and opened
def count_by_state def count_by_state
{ {
all: row_count, all: row_count
opened: row_count
} }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment