kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed failing tests

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/milestones_controller.rb
View file

@ -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

11
app/helpers/labels_helper.rb
View file

@ -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