diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/labels_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/projects/milestones_controller.rb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 439c11b0bf3..a9fc890b28c 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -1,5 +1,6 @@ class Projects::LabelsController < Projects::ApplicationController include ToggleSubscriptionAction + include FlashHelper before_action :check_issuables_available! before_action :label, only: [:edit, :update, :destroy, :promote] @@ -114,7 +115,7 @@ class Projects::LabelsController < Projects::ApplicationController respond_to do |format| format.html do - redirect_to(project_labels_path(@project), status: 303) + redirect_to(project_labels_path(@project, body_data: get_body_data_page(project_labels_path(@project))), status: 303) end format.js end diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index 4fd36eb8cec..9a4e99c39e9 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -1,5 +1,6 @@ class Projects::MilestonesController < Projects::ApplicationController include MilestoneActions + include FlashHelper before_action :check_issuables_available! before_action :milestone, only: [:edit, :update, :destroy, :show, :merge_requests, :participants, :labels, :promote] @@ -70,8 +71,8 @@ class Projects::MilestonesController < Projects::ApplicationController end def promote - promoted_milestone = Milestones::PromoteService.new(project, current_user).execute(milestone) - redirect_to group_milestone_path(project.group, promoted_milestone.iid), status: 303 + Milestones::PromoteService.new(project, current_user).execute(milestone) + redirect_to project_milestones_path(project, body_data: get_body_data_page(project_milestones_path(project))), status: 303 rescue Milestones::PromoteService::PromoteMilestoneError => error redirect_to milestone, alert: error.message end |