Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/app/services/concerns/issues/resolve_discussions.rb b/app/services/concerns/issues/resolve_discussions.rb
index f0e9862ca30..5e87f610e4e 100644
--- a/app/services/concerns/issues/resolve_discussions.rb
+++ b/app/services/concerns/issues/resolve_discussions.rb
@@ -16,7 +16,11 @@ module Issues
     # rubocop: disable CodeReuse/ActiveRecord
     def merge_request_to_resolve_discussions_of
       strong_memoize(:merge_request_to_resolve_discussions_of) do
-        MergeRequestsFinder.new(current_user, project_id: project.id)
+        # sometimes this will be a Group, when work item is created at group level.
+        # Not sure if we will need to handle resolving an MR with an issue at group level?
+        next unless container.is_a?(Project)
+
+        MergeRequestsFinder.new(current_user, project_id: container.id)
           .find_by(iid: merge_request_to_resolve_discussions_of_iid)
       end
     end