diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-20 08:58:30 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-20 08:58:30 -0500 |
| commit | f85ee787fd5aeb849065179fe41b3ca39527dfa0 (patch) | |
| tree | 29dea2de351941b7e589c6393162882c6401f679 /app/views | |
| parent | 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d (diff) | |
| download | gitlab-ce-f85ee787fd5aeb849065179fe41b3ca39527dfa0.tar.gz | |
Revert sticky confidential header
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 07445434cf3..d0698285f84 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -9,6 +9,12 @@ %li %a.js-md-preview-button{ href: "#md-preview-holder", tabindex: -1 } Preview + + - if defined?(@issue) && @issue.confidential? + %li.confidential-issue-warning + = icon('warning') + %span This is a confidential issue. Your comment will not be visible to the public. + %li.pull-right .toolbar-group = markdown_toolbar_button({ icon: "bold fw", data: { "md-tag" => "**" }, title: "Add bold text" }) diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 5f92d020eef..d909b0bfbbd 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -5,13 +5,6 @@ - can_update_issue = can?(current_user, :update_issue, @issue) - can_report_spam = @issue.submittable_as_spam_by?(current_user) -- if defined?(@issue) && @issue.confidential? - .confidential-issue-warning{ data: { spy: 'affix' } } - %span.confidential-issue-text - #{confidential_icon(@issue)} This issue is confidential. - %a{ href: help_page_path('user/project/issues/confidential_issues'), target: '_blank' } - What are confidential issues? - .clearfix.detail-page-header .issuable-header .issuable-status-box.status-box.status-box-closed{ class: issue_button_visibility(@issue, false) } @@ -26,6 +19,7 @@ = icon('angle-double-left') .issuable-meta + = confidential_icon(@issue) = issuable_meta(@issue, @project, "Issue") .issuable-actions |