diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/controllers/groups/milestones_controller.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/controllers/groups/milestones_controller.rb')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 84dc570a1e9..e9dce3947dd 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -21,7 +21,7 @@ class Groups::MilestonesController < Groups::ApplicationController end def new - @milestone = Milestone.new + @noteable = @milestone = Milestone.new end def create @@ -70,7 +70,7 @@ class Groups::MilestonesController < Groups::ApplicationController end def milestone - @milestone = group.milestones.find_by_iid(params[:id]) + @noteable = @milestone ||= group.milestones.find_by_iid(params[:id]) render_404 unless @milestone end @@ -95,4 +95,4 @@ class Groups::MilestonesController < Groups::ApplicationController end end -Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController') +Groups::MilestonesController.prepend_mod_with('Groups::MilestonesController') |