summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-08-15 13:50:07 +0000
committerJarka Kadlecova <jarka@gitlab.com>2017-08-16 17:26:26 +0200
commitb4f1b9ff1178e266850f3b153913eadfbf489e12 (patch)
treeda447ea9f8cbc94ba06ad5cc19ab2c77755e53f0
parent86817780eb5f3459cd1b018925ac108c0f235b95 (diff)
downloadgitlab-ce-b4f1b9ff1178e266850f3b153913eadfbf489e12.tar.gz
Merge branch '36450_confi_polish' into 'master'
Change Confidential Message When Visible - UI Polish See merge request !13551
-rw-r--r--app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue2
-rw-r--r--spec/javascripts/sidebar/confidential_issue_sidebar_spec.js2
2 files changed, 2 insertions, 2 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>
diff --git a/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js b/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
index 90eac1ed1ab..2e16adffb5b 100644
--- a/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
+++ b/spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
@@ -41,7 +41,7 @@ describe('Confidential Issue Sidebar Block', () => {
).toBe(true);
expect(
- vm2.$el.innerHTML.includes('None'),
+ vm2.$el.innerHTML.includes('This issue is not confidential'),
).toBe(true);
});