Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-17 12:09:06 +0300
committerPhil Hughes <me@iamphill.com>2016-03-18 18:18:06 +0300
commit0eecc214853fc07b9237b50ab65a6c702cbfaeb4 (patch)
tree1fa57614a896f042a0365d5d08429d81e37105e3 /app/controllers/projects/milestones_controller.rb
parentd847db79cb6a99d9cfb6f4c57587887942965388 (diff)
Updated controller with before_action
Fixed other issues based on feedback
Diffstat (limited to 'app/controllers/projects/milestones_controller.rb')
-rw-r--r--app/controllers/projects/milestones_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index cfb0435717e..7b70f5fa7d7 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -19,13 +19,13 @@ 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.html do
+ @milestones = @milestones.page(params[:page]).per(PER_PAGE)
+ end
format.json do
- render json: @milestones_all.to_json
+ render json: @milestones_all
end
end
end