From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Aug 2021 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee --- app/helpers/issues_helper.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'app/helpers/issues_helper.rb') diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 5bedfc61d46..bbafdac9a7f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -48,10 +48,22 @@ module IssuesHelper end end + def work_item_type_icon(issue_type) + if WorkItem::Type.base_types.include?(issue_type) + "issue-type-#{issue_type.to_s.dasherize}" + else + 'issue-type-issue' + end + end + def confidential_icon(issue) sprite_icon('eye-slash', css_class: 'gl-vertical-align-text-bottom') if issue.confidential? end + def hidden_issue_icon(issue) + sprite_icon('spam', css_class: 'gl-vertical-align-text-bottom') if issue.hidden? + end + def award_user_list(awards, current_user, limit: 10) names = awards.map do |award| award.user == current_user ? 'You' : award.user.name @@ -195,7 +207,7 @@ module IssuesHelper initial_email: project.new_issuable_address(current_user, 'issue'), is_signed_in: current_user.present?.to_s, issues_path: project_issues_path(project), - jira_integration_path: help_page_url('integration/jira/', anchor: 'view-jira-issues'), + jira_integration_path: help_page_url('integration/jira/issues', anchor: 'view-jira-issues'), markdown_help_path: help_page_path('user/markdown'), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), new_issue_path: new_project_issue_path(project, issue: { milestone_id: finder.milestones.first.try(:id) }), -- cgit v1.2.1