Commit a45cb688 authored by Phil Hughes's avatar Phil Hughes

Fixed failing tests

parent 0eecc214
...@@ -25,7 +25,7 @@ class Projects::MilestonesController < Projects::ApplicationController ...@@ -25,7 +25,7 @@ class Projects::MilestonesController < Projects::ApplicationController
@milestones = @milestones.page(params[:page]).per(PER_PAGE) @milestones = @milestones.page(params[:page]).per(PER_PAGE)
end end
format.json do format.json do
render json: @milestones_all render json: @milestones
end end
end end
end end
......
...@@ -110,7 +110,6 @@ module LabelsHelper ...@@ -110,7 +110,6 @@ module LabelsHelper
end end
def projects_labels_options def projects_labels_options
labels =
if @project if @project
@project.labels @project.labels
else else
......
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