Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8c3277d6
Commit
8c3277d6
authored
Nov 07, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move epics views to the correct directory
parent
8502eb4a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
16 deletions
+4
-16
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+1
-7
ee/app/controllers/groups/epics_controller.rb
ee/app/controllers/groups/epics_controller.rb
+2
-8
ee/app/views/groups/epics/_epics.html.haml
ee/app/views/groups/epics/_epics.html.haml
+0
-0
ee/app/views/groups/epics/index.html.haml
ee/app/views/groups/epics/index.html.haml
+0
-0
ee/app/views/groups/epics/show.html.haml
ee/app/views/groups/epics/show.html.haml
+0
-0
spec/ee/spec/controllers/groups/epics_controller_spec.rb
spec/ee/spec/controllers/groups/epics_controller_spec.rb
+1
-1
No files found.
app/controllers/concerns/issuable_actions.rb
View file @
8c3277d6
...
@@ -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
...
...
ee/app/controllers/groups/epics_controller.rb
View file @
8c3277d6
...
@@ -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/e
e/e
pics/_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
...
...
ee/app/views/groups/e
e/e
pics/_epics.html.haml
→
ee/app/views/groups/epics/_epics.html.haml
View file @
8c3277d6
File moved
ee/app/views/groups/e
e/e
pics/index.html.haml
→
ee/app/views/groups/epics/index.html.haml
View file @
8c3277d6
File moved
ee/app/views/groups/e
e/e
pics/show.html.haml
→
ee/app/views/groups/epics/show.html.haml
View file @
8c3277d6
File moved
spec/ee/spec/controllers/groups/epics_controller_spec.rb
View file @
8c3277d6
...
@@ -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/e
e/e
pics/show'
expect
(
response
).
to
render_template
'groups/epics/show'
end
end
context
'with unauthorized user'
do
context
'with unauthorized user'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment