diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
| commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
| tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /app/assets/javascripts/sidebar | |
| parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-fix-btn-alignment.tar.gz | |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue index 422c02c7b7e..cfacba09fad 100644 --- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue +++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue @@ -71,7 +71,7 @@ export default { /> <div v-if="!isConfidential" class="no-value confidential-value"> <i class="fa fa-eye is-not-confidential"></i> - None + This issue is not confidential </div> <div v-else class="value confidential-value hide-collapsed"> <i aria-hidden="true" data-hidden="true" class="fa fa-eye-slash is-confidential"></i> |