diff options
Diffstat (limited to 'app/views/projects/issues')
-rw-r--r-- | app/views/projects/issues/_issue.html.haml | 5 | ||||
-rw-r--r-- | app/views/projects/issues/captcha_check.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/issues/verify.html.haml | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 9c01d93f7d0..ee3aaee6dbb 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -12,6 +12,9 @@ - if issue.confidential? %span.has-tooltip{ title: _('Confidential') } = confidential_icon(issue) + - if Feature.enabled?(:ban_user_feature_flag) && issue.hidden? + %span.has-tooltip{ title: _('This issue is hidden because its author has been banned') } + = hidden_issue_icon(issue) = link_to issue.title, issue_path(issue) = render_if_exists 'projects/issues/subepic_flag', issue: issue - if issue.tasks? @@ -36,7 +39,7 @@ = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom') = issue.milestone.title - if issue.due_date - %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') } + %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') } = sprite_icon('calendar') = issue.due_date.to_s(:medium) diff --git a/app/views/projects/issues/captcha_check.html.haml b/app/views/projects/issues/captcha_check.html.haml new file mode 100644 index 00000000000..657c5c2cd8f --- /dev/null +++ b/app/views/projects/issues/captcha_check.html.haml @@ -0,0 +1,7 @@ += render layout: 'shared/captcha_check', locals: { spammable: @issue } do + -# These fields are for values which are passed via URL parameters, and not included in the + -# issue's params, so they must be yielded to the block to be rendered. + -# If these are removed and no longer passed via URL parameters, the support + -# for yielding in the layout can also be removed. + = hidden_field_tag(:merge_request_to_resolve_discussions_of, params[:merge_request_to_resolve_discussions_of]) + = hidden_field_tag(:discussion_to_resolve, params[:discussion_to_resolve]) diff --git a/app/views/projects/issues/verify.html.haml b/app/views/projects/issues/verify.html.haml deleted file mode 100644 index 935a3493a37..00000000000 --- a/app/views/projects/issues/verify.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -= render layout: 'layouts/recaptcha_verification', locals: { spammable: @issue } do - = hidden_field_tag(:merge_request_to_resolve_discussions_of, params[:merge_request_to_resolve_discussions_of]) - = hidden_field_tag(:discussion_to_resolve, params[:discussion_to_resolve]) |