diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index 4841225de08a0d94f28a86c30c08c079983effa5..de38d26e3fe9594acd3f8a8f109f45bce4605978 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -24,12 +24,9 @@ def set_issuables_index show_alert_if_search_is_disabled @issuables = issuables_collection + set_pagination - unless pagination_disabled? - set_pagination - - return if redirect_out_of_range(@issuables, @total_pages) - end + return if redirect_out_of_range(@issuables, @total_pages) if params[:label_name].present? && @project labels_params = { project_id: @project.id, title: params[:label_name] } @@ -59,10 +56,6 @@ def set_pagination end # rubocop:enable Gitlab/ModuleWithInstanceVariables - def pagination_disabled? - false - end - # rubocop: disable CodeReuse/ActiveRecord def issuables_collection finder.execute.preload(preload_for_collection) diff --git a/ee/app/controllers/groups/epics_controller.rb b/ee/app/controllers/groups/epics_controller.rb index 92a2c4df76da6d46263e4262624d5278126704ba..11412602d921511084b5d83d262a145c3c6b1553 100644 --- a/ee/app/controllers/groups/epics_controller.rb +++ b/ee/app/controllers/groups/epics_controller.rb @@ -30,17 +30,6 @@ def new @noteable = Epic.new end - def index - respond_to do |format| - format.html - format.json do - set_issuables_index - - render json: serializer.represent(@issuables) - end - end - end - def create @epic = ::Epics::CreateService.new(group: @group, current_user: current_user, params: epic_params).execute @@ -55,10 +44,6 @@ def create private - def pagination_disabled? - request.format.json? - end - # rubocop: disable CodeReuse/ActiveRecord def epic @issuable = @epic ||= @group.epics.find_by(iid: params[:epic_id] || params[:id]) @@ -116,10 +101,6 @@ def sorting_field :epics_sort end - def preload_for_collection - @preload_for_collection ||= [:group, :author, :labels] - end - def log_epic_show return unless current_user && @epic diff --git a/ee/spec/controllers/groups/epics_controller_spec.rb b/ee/spec/controllers/groups/epics_controller_spec.rb index 878f933caa86fde18ed04c756c51def5b1c9186b..386555d36bf16e68e98cfe1a95410c54edfa0be9 100644 --- a/ee/spec/controllers/groups/epics_controller_spec.rb +++ b/ee/spec/controllers/groups/epics_controller_spec.rb @@ -64,66 +64,6 @@ expect(response).to have_gitlab_http_status(:ok) end - - context 'when format is JSON' do - before do - allow(Kaminari.config).to receive(:default_per_page).and_return(1) - end - - def list_epics - get :index, params: { group_id: group }, format: :json - end - - it 'returns a list of epics' do - list_epics - - expect(json_response).to be_an Array - end - - it 'does not use pagination' do - list_epics - - expect(json_response.size).to eq(2) - end - - it 'returns correct epic attributes' do - list_epics - item = json_response.first - epic = Epic.find(item['id']) - - expect(item['group_id']).to eq(group.id) - expect(item['start_date']).to eq(epic.start_date) - expect(item['end_date']).to eq(epic.end_date) - expect(item['web_url']).to eq(group_epic_path(group, epic)) - end - - context 'with parent_id filter' do - let(:parent_epic) { create(:epic, group: group) } - - it 'returns child epics of the given parent' do - child_epics = create_list(:epic, 2, group: group, parent: parent_epic) - # descendant epic that should not be included - create(:epic, group: group, parent: child_epics.first) - - get :index, params: { group_id: group, parent_id: parent_epic.id }, format: :json - - expect(json_response.size).to eq(2) - expect(json_response.map { |e| e['id'] }).to match_array(child_epics.map(&:id)) - end - end - - context 'using label_name filter' do - let(:label) { create(:group_label, group: group) } - let!(:labeled_epic) { create(:labeled_epic, group: group, labels: [label]) } - - it 'returns all epics with given label' do - get :index, params: { group_id: group, label_name: label.title }, format: :json - - expect(json_response.size).to eq(1) - expect(json_response.first['id']).to eq(labeled_epic.id) - end - end - end end describe 'GET #discussions' do