Commit 5e49495b authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Adjust wrong conflict resolution in Groups::EpicsController#show

parent 10be501b
...@@ -9,7 +9,10 @@ module IssuableActions ...@@ -9,7 +9,10 @@ module IssuableActions
def show def show
respond_to do |format| respond_to do |format|
format.html format.html do
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
......
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