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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
4b812d97
Commit
4b812d97
authored
Apr 26, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing specs
parent
480fcb55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
app/controllers/concerns/milestone_actions.rb
app/controllers/concerns/milestone_actions.rb
+4
-4
spec/controllers/projects/milestones_controller_spec.rb
spec/controllers/projects/milestones_controller_spec.rb
+0
-2
No files found.
app/controllers/concerns/milestone_actions.rb
View file @
4b812d97
...
@@ -3,7 +3,7 @@ module MilestoneActions
...
@@ -3,7 +3,7 @@ module MilestoneActions
def
merge_requests
def
merge_requests
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
milestone_path
}
format
.
html
{
redirect_to
milestone_
redirect_
path
}
format
.
json
do
format
.
json
do
render
json:
tabs_json
(
"shared/milestones/_merge_requests_tab"
,
{
render
json:
tabs_json
(
"shared/milestones/_merge_requests_tab"
,
{
merge_requests:
@milestone
.
merge_requests
,
merge_requests:
@milestone
.
merge_requests
,
...
@@ -15,7 +15,7 @@ module MilestoneActions
...
@@ -15,7 +15,7 @@ module MilestoneActions
def
participants
def
participants
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
milestone_path
}
format
.
html
{
redirect_to
milestone_
redirect_
path
}
format
.
json
do
format
.
json
do
render
json:
tabs_json
(
"shared/milestones/_participants_tab"
,
{
render
json:
tabs_json
(
"shared/milestones/_participants_tab"
,
{
users:
@milestone
.
participants
users:
@milestone
.
participants
...
@@ -26,7 +26,7 @@ module MilestoneActions
...
@@ -26,7 +26,7 @@ module MilestoneActions
def
labels
def
labels
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
milestone_path
}
format
.
html
{
redirect_to
milestone_
redirect_
path
}
format
.
json
do
format
.
json
do
render
json:
tabs_json
(
"shared/milestones/_labels_tab"
,
{
render
json:
tabs_json
(
"shared/milestones/_labels_tab"
,
{
labels:
@milestone
.
labels
labels:
@milestone
.
labels
...
@@ -43,7 +43,7 @@ module MilestoneActions
...
@@ -43,7 +43,7 @@ module MilestoneActions
}
}
end
end
def
milestone_path
def
milestone_
redirect_
path
if
@project
if
@project
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
)
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
)
else
else
...
...
spec/controllers/projects/milestones_controller_spec.rb
View file @
4b812d97
...
@@ -52,6 +52,4 @@ describe Projects::MilestonesController do
...
@@ -52,6 +52,4 @@ describe Projects::MilestonesController do
expect
(
last_note
).
to
eq
(
'removed milestone'
)
expect
(
last_note
).
to
eq
(
'removed milestone'
)
end
end
end
end
end
end
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