diff options
author | Phil Hughes <me@iamphill.com> | 2016-03-16 18:08:35 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-03-18 15:18:06 +0000 |
commit | 0858cb097afcaa529e5e0fe7154af53f66ce62fe (patch) | |
tree | 0ad7db2dec770e890c7e8002860bbd7dcff127fa /app/controllers/projects/milestones_controller.rb | |
parent | 9280fd4acda1da9ed2435bd83d96892d77f37e90 (diff) | |
download | gitlab-ce-0858cb097afcaa529e5e0fe7154af53f66ce62fe.tar.gz |
Fixed issue with labels dropdown getting wrong labels
Diffstat (limited to 'app/controllers/projects/milestones_controller.rb')
-rw-r--r-- | app/controllers/projects/milestones_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index da46731d945..cfb0435717e 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -19,7 +19,15 @@ class Projects::MilestonesController < Projects::ApplicationController end @milestones = @milestones.includes(:project) + @milestones_all = @milestones @milestones = @milestones.page(params[:page]).per(PER_PAGE) + + respond_to do |format| + format.html + format.json do + render json: @milestones_all.to_json + end + end end def new |