diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 15:07:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 15:07:42 +0000 |
| commit | fa7c331b76ed59230cc56fc51bfc9e467c8bb9b4 (patch) | |
| tree | eb03d2b6e8dd45f67864635c8b0b0de8d671edf7 /app/controllers | |
| parent | f26f31d2fd8e3c91677e2629293b9e0562c1437a (diff) | |
| download | gitlab-ce-fa7c331b76ed59230cc56fc51bfc9e467c8bb9b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 980275147ae..0ec23a3265f 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -90,7 +90,7 @@ module IssuableActions end def destroy - Issuable::DestroyService.new(project: issuable.project, current_user: current_user).execute(issuable) + Issuable::DestroyService.new(container: issuable.project, current_user: current_user).execute(issuable) name = issuable.human_class_name flash[:notice] = "The #{name} was successfully deleted." diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 3731257033d..97d0fa43529 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -191,7 +191,7 @@ class Projects::IssuesController < Projects::ApplicationController new_project = Project.find(params[:move_to_project_id]) return render_404 unless issue.can_move?(current_user, new_project) - @issue = ::Issues::MoveService.new(project: project, current_user: current_user).execute(issue, new_project) + @issue = ::Issues::MoveService.new(container: project, current_user: current_user).execute(issue, new_project) end respond_to do |format| |