From 25989ab7ef1a444ed2abd5479f176d58e1d9462a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Oct 2019 11:11:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/workers/namespaceless_project_destroy_worker.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/workers/namespaceless_project_destroy_worker.rb') diff --git a/app/workers/namespaceless_project_destroy_worker.rb b/app/workers/namespaceless_project_destroy_worker.rb index f6e98746055..113afc268f2 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -10,6 +10,8 @@ class NamespacelessProjectDestroyWorker include ApplicationWorker include ExceptionBacktrace + feature_category :authentication_and_authorization + def perform(project_id) begin project = Project.unscoped.find(project_id) @@ -31,6 +33,6 @@ class NamespacelessProjectDestroyWorker def unlink_fork(project) merge_requests = project.forked_from_project.merge_requests.opened.from_project(project) - merge_requests.update_all(state: 'closed') + merge_requests.update_all(state_id: MergeRequest.available_states[:closed]) end end -- cgit v1.2.1