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,12 +110,11 @@ module LabelsHelper ...@@ -110,12 +110,11 @@ module LabelsHelper
end end
def projects_labels_options def projects_labels_options
labels = if @project
if @project @project.labels
@project.labels else
else Label.where(project_id: @projects)
Label.where(project_id: @projects) end
end
end end
def labels_filter_path def labels_filter_path
......
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