BigW Consortium Gitlab

Commit 4b812d97 by Phil Hughes

Fixed failing specs

parent 480fcb55
...@@ -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
......
...@@ -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
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