Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 0 deletions

diff --git a/app/helpers/notify_helper.rb b/app/helpers/notify_helper.rb
new file mode 100644
index 00000000000..fb68029928c
--- /dev/null
+++ b/app/helpers/notify_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module NotifyHelper
+  def merge_request_reference_link(entity, *args)
+    link_to(entity.to_reference, merge_request_url(entity, *args))
+  end
+
+  def issue_reference_link(entity, *args)
+    link_to(entity.to_reference, issue_url(entity, *args))
+  end
+end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 8df3b8356e7..2470312d8ac 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -750,6 +750,10 @@ module ProjectsHelper
 
     ::Feature.enabled?(:resource_access_token, project)
   end
+
+  def render_service_desk_menu?
+    false
+  end
 end
 
 ProjectsHelper.prepend_if_ee('EE::ProjectsHelper')