diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 18:29:48 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 18:29:48 +0000 |
| commit | ed9b1bd63f98a0ef0ad7b9bfb56882c08b652b1e (patch) | |
| tree | 6d3c6c9360804e4cc63554c0e0fd0b844776f81d | |
| parent | 4d4a9b7c8a62b720e573a2bec67407acc455531a (diff) | |
| parent | f0f8efeb3465d5a6915a680bc96a4cdc9384bd4b (diff) | |
| download | gitlab-ce-ed9b1bd63f98a0ef0ad7b9bfb56882c08b652b1e.tar.gz | |
Merge branch 'confidential-issue-notice' into 'master'
Add confidential issue notice in comment box.
## What does this MR do?
Adds a warning about confidential issues to the comment field when the issue is confidential.
## Are there points in the code the reviewer needs to double check?
I don't think so.
## Why was this MR needed?
It wasn't clear to users that they were commenting on a confidential issue, this makes it more explicit.
## What are the relevant issue numbers?
Fixes #15288
## Screenshots (if relevant)
This is what it looks like at various screen sizes:
cc: @jschatz1 @dzaporozhets
See merge request !4473
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 33 | ||||
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 6 |
3 files changed, 40 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index fe9b9bec868..575279e912c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,7 @@ v 8.9.0 (unreleased) - Improve error handling importing projects - Put project Files and Commits tabs under Code tab - Replace Colorize with Rainbow for coloring console output in Rake tasks. + - An indicator is now displayed at the top of the comment field for confidential issues. v 8.8.4 (unreleased) - Ensure branch cleanup regardless of whether the GitHub import process succeeds diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 7fa13e66b43..a6765fbc7c7 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -87,6 +87,39 @@ } } +.md-header .nav-links { + display: flex; + display: -webkit-flex; + flex-flow: row wrap; + -webkit-flex-flow: row wrap; + width: 100%; + + .pull-right { + // Flexbox quirk to make sure right-aligned items stay right-aligned. + margin-left: auto; + } +} + +.confidential-issue-warning { + background-color: $gray-normal; + border-radius: 3px; + padding: 3px 12px; + margin: auto; + margin-top: 0; + text-align: center; + font-size: 13px; + + @media (max-width: $screen-md-min) { + // On smaller devices the warning becomes the fourth item in the list, + // rather than centering, and grows to span the full width of the + // comment area. + order: 4; + -webkit-order: 4; + margin: 6px auto; + width: 100%; + } +} + .discussion-form { padding: $gl-padding-top $gl-padding; background-color: $white-light; diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 81afea2c60a..28a28282fd3 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -7,6 +7,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 %button.zen-control.zen-control-full.js-zen-enter{ type: 'button', tabindex: -1 } Go full screen |