Fixed failing tests

This commit is contained in:
Phil Hughes 2016-03-17 10:40:54 +00:00
parent 0eecc21485
commit a45cb68809
2 changed files with 6 additions and 7 deletions

View file

@ -25,7 +25,7 @@ class Projects::MilestonesController < Projects::ApplicationController
@milestones = @milestones.page(params[:page]).per(PER_PAGE)
end
format.json do
render json: @milestones_all
render json: @milestones
end
end
end

View file

@ -110,12 +110,11 @@ module LabelsHelper
end
def projects_labels_options
labels =
if @project
@project.labels
else
Label.where(project_id: @projects)
end
if @project
@project.labels
else
Label.where(project_id: @projects)
end
end
def labels_filter_path