diff options
| author | Eagllus <rvanzon@gitlab.com> | 2018-10-16 14:52:08 +0200 |
|---|---|---|
| committer | Eagllus <rvanzon@gitlab.com> | 2018-10-16 15:13:03 +0200 |
| commit | 074fafe9e09935cd53cf286ad00b9d53240a9413 (patch) | |
| tree | 85bbdae9cdec3cede37881d28a41c8a06df0cad3 | |
| parent | 43f32c6bf966a85d6d5e1d8933a1cea67ec89ba4 (diff) | |
| download | gitlab-ce-074fafe9e09935cd53cf286ad00b9d53240a9413.tar.gz | |
Update code according comment recommendations
| -rw-r--r-- | app/controllers/dashboard/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/dashboard/application_controller.rb b/app/controllers/dashboard/application_controller.rb index 1c9a5917da5..cee0753a021 100644 --- a/app/controllers/dashboard/application_controller.rb +++ b/app/controllers/dashboard/application_controller.rb @@ -12,8 +12,4 @@ class Dashboard::ApplicationController < ApplicationController def projects @projects ||= current_user.authorized_projects.sorted_by_activity.non_archived end - - def groups - @groups ||= GroupsFinder.new(current_user, state_all: true).execute - end end diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index ddc1a66d11d..8252a0f2511 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -4,13 +4,13 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController include MilestoneActions before_action :projects - before_action :groups + before_action :groups, only: :index before_action :milestone, only: [:show, :merge_requests, :participants, :labels] def index respond_to do |format| format.html do - @milestone_states = GlobalMilestone.states_count(@projects, @groups) + @milestone_states = Milestone.states_count(@projects, @groups) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end format.json do @@ -43,4 +43,8 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController @milestone = DashboardMilestone.build(@projects, params[:title]) render_404 unless @milestone end + + def groups + @groups ||= GroupsFinder.new(current_user, state_all: true).execute + end end diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index a7cee426cf1..b42116b0f36 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -10,7 +10,7 @@ class Groups::MilestonesController < Groups::ApplicationController def index respond_to do |format| format.html do - @milestone_states = GlobalMilestone.states_count(group_projects, group) + @milestone_states = Milestone.states_count(group_projects, [group]) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end format.json do |