Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 1 deletions

diff --git a/app/controllers/groups/work_items_controller.rb b/app/controllers/groups/work_items_controller.rb
index ece279da778..bfb5b74d2a5 100644
--- a/app/controllers/groups/work_items_controller.rb
+++ b/app/controllers/groups/work_items_controller.rb
@@ -20,3 +20,5 @@ module Groups
     end
   end
 end
+
+Groups::WorkItemsController.prepend_mod
diff --git a/app/models/description_version.rb b/app/models/description_version.rb
index 05cca9f931f..71c16621c9e 100644
--- a/app/models/description_version.rb
+++ b/app/models/description_version.rb
@@ -31,4 +31,4 @@ class DescriptionVersion < ApplicationRecord
   end
 end
 
-DescriptionVersion.prepend_mod_with('DescriptionVersion')
+DescriptionVersion.prepend_mod
diff --git a/app/models/work_item.rb b/app/models/work_item.rb
index a62d77939bf..05c230628ce 100644
--- a/app/models/work_item.rb
+++ b/app/models/work_item.rb
@@ -37,6 +37,10 @@ class WorkItem < Issue
   }
 
   class << self
+    def find_by_namespace_and_iid!(namespace, iid)
+      find_by!(namespace: namespace, iid: iid)
+    end
+
     def assignee_association_name
       'issue'
     end