diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 12:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 12:08:53 +0300 |
commit | 1c75400c24137f603678d0ee3d497b0c9280e7f7 (patch) | |
tree | ccf2e8584d8b7efd3c648a276ebe5b456639da3b /app/helpers | |
parent | 1f23012963babbcc586e7025cc28e62385813fb6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/notify_helper.rb | 11 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 4 |
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') |