diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-30 10:54:57 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-30 11:13:24 +0200 |
| commit | e66a8b4cdab176ff89a685788dcbcac089712e49 (patch) | |
| tree | 58cd81b66bef2e0170e66bde18eadb028b0e973c /app/controllers/groups | |
| parent | c223fb1a9677ae00285426090618f5762de9f40e (diff) | |
| download | gitlab-ce-e66a8b4cdab176ff89a685788dcbcac089712e49.tar.gz | |
Move milestone link in group head, 2 column milestone for MR and issues.
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 235b27f53a9..c4b87308e8b 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -14,8 +14,8 @@ class Groups::MilestonesController < ApplicationController def show project_milestones = Milestone.where(project_id: group.projects) @group_milestone = Milestones::GroupService.new(project_milestones).milestone(title) - @project_issues = @group_milestone.filter_by(params[:status], "issues") - @project_merge_requests = @group_milestone.filter_by(params[:status], "merge_requests") + @issues = @group_milestone.issues + @merge_requests = @group_milestone.merge_requests end def update |