Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
83bc6923
Commit
83bc6923
authored
May 21, 2018
by
Mario de la Ossa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract EE-specific code from app/controllers/groups/milestones_controller.rb
parent
546d11f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
app/controllers/groups/milestones_controller.rb
app/controllers/groups/milestones_controller.rb
+6
-7
ee/app/controllers/ee/groups/milestones_controller.rb
ee/app/controllers/ee/groups/milestones_controller.rb
+12
-0
No files found.
app/controllers/groups/milestones_controller.rb
View file @
83bc6923
class
Groups::MilestonesController
<
Groups
::
ApplicationController
prepend
EE
::
Groups
::
MilestonesController
include
MilestoneActions
before_action
:group_projects
...
...
@@ -77,17 +79,14 @@ class Groups::MilestonesController < Groups::ApplicationController
def
milestones
milestones
=
MilestonesFinder
.
new
(
search_params
).
execute
legacy_milestones
=
if
params
[
:only_group_milestones
]
[]
else
GroupMilestone
.
build_collection
(
group
,
group_projects
,
params
)
end
@sort
=
params
[
:sort
]
||
'due_date_asc'
MilestoneArray
.
sort
(
milestones
+
legacy_milestones
,
@sort
)
end
def
legacy_milestones
GroupMilestone
.
build_collection
(
group
,
group_projects
,
params
)
end
def
milestone
@milestone
=
if
params
[
:title
]
...
...
ee/app/controllers/ee/groups/milestones_controller.rb
0 → 100644
View file @
83bc6923
module
EE
module
Groups
module
MilestonesController
extend
::
Gitlab
::
Utils
::
Override
override
:legacy_milestones
def
legacy_milestones
params
[
:only_group_milestones
]
?
[]
:
super
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment