Commit 8c3277d6 authored by Jarka Kadlecova's avatar Jarka Kadlecova

Move epics views to the correct directory

parent 8502eb4a
...@@ -9,9 +9,7 @@ module IssuableActions ...@@ -9,9 +9,7 @@ module IssuableActions
def show def show
respond_to do |format| respond_to do |format|
format.html do format.html
render show_view
end
format.json do format.json do
render json: serializer.represent(issuable, serializer: params[:serializer]) render json: serializer.represent(issuable, serializer: params[:serializer])
end end
...@@ -153,10 +151,6 @@ module IssuableActions ...@@ -153,10 +151,6 @@ module IssuableActions
end end
end end
def show_view
'show'
end
def serializer def serializer
raise NotImplementedError raise NotImplementedError
end end
......
...@@ -12,12 +12,10 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -12,12 +12,10 @@ class Groups::EpicsController < Groups::ApplicationController
@epics = @issuables @epics = @issuables
respond_to do |format| respond_to do |format|
format.html do format.html
render 'groups/ee/epics/index'
end
format.json do format.json do
render json: { render json: {
html: view_to_html_string("groups/ee/epics/_epics") html: view_to_html_string("groups/epics/_epics")
} }
end end
end end
...@@ -55,10 +53,6 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -55,10 +53,6 @@ class Groups::EpicsController < Groups::ApplicationController
Epics::UpdateService.new(nil, current_user, epic_params) Epics::UpdateService.new(nil, current_user, epic_params)
end end
def show_view
'groups/ee/epics/show'
end
def finder_type def finder_type
EpicsFinder EpicsFinder
end end
......
...@@ -56,7 +56,7 @@ describe Groups::EpicsController do ...@@ -56,7 +56,7 @@ describe Groups::EpicsController do
show_epic show_epic
expect(response.content_type).to eq 'text/html' expect(response.content_type).to eq 'text/html'
expect(response).to render_template 'groups/ee/epics/show' expect(response).to render_template 'groups/epics/show'
end end
context 'with unauthorized user' do context 'with unauthorized user' do
......
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