diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/helpers/issues_helper.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r-- | app/helpers/issues_helper.rb | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 39edfeea81e..244b97c7196 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -9,40 +9,6 @@ module IssuesHelper classes.join(' ') end - def url_for_issue(issue_iid, project = @project, options = {}) - return '' if project.nil? - - url = - if options[:internal] - url_for_internal_issue(issue_iid, project, options) - else - url_for_tracker_issue(issue_iid, project, options) - end - - # Ensure we return a valid URL to prevent possible XSS. - URI.parse(url).to_s - rescue URI::InvalidURIError - '' - end - - def url_for_tracker_issue(issue_iid, project, options) - if options[:only_path] - project.issues_tracker.issue_path(issue_iid) - else - project.issues_tracker.issue_url(issue_iid) - end - end - - def url_for_internal_issue(issue_iid, project = @project, options = {}) - helpers = Gitlab::Routing.url_helpers - - if options[:only_path] - helpers.namespace_project_issue_path(namespace_id: project.namespace, project_id: project, id: issue_iid) - else - helpers.namespace_project_issue_url(namespace_id: project.namespace, project_id: project, id: issue_iid) - end - end - def status_box_class(item) if item.try(:expired?) 'status-box-expired' @@ -168,11 +134,6 @@ module IssuesHelper def show_moved_service_desk_issue_warning?(issue) false end - - # Required for Banzai::Filter::IssueReferenceFilter - module_function :url_for_issue - module_function :url_for_internal_issue - module_function :url_for_tracker_issue end IssuesHelper.prepend_if_ee('EE::IssuesHelper') |