From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 12:26:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- app/helpers/issues_helper.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/helpers/issues_helper.rb') diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 244b97c7196..61fe075303c 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -41,7 +41,7 @@ module IssuesHelper end def confidential_icon(issue) - icon('eye-slash') if issue.confidential? + sprite_icon('eye-slash', size: 16, css_class: 'gl-vertical-align-text-bottom') if issue.confidential? end def award_user_list(awards, current_user, limit: 10) @@ -132,7 +132,10 @@ module IssuesHelper end def show_moved_service_desk_issue_warning?(issue) - false + return false unless issue.moved_from + return false unless issue.from_service_desk? + + issue.moved_from.project.service_desk_enabled? && !issue.project.service_desk_enabled? end end -- cgit v1.2.3