diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 16:50:07 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 16:50:07 +0300 |
commit | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (patch) | |
tree | 74627084045f20a7fd9bb9b7313db306f4f04474 | |
parent | f2cae26836570a1feadc488aa086215c53024e0d (diff) | |
parent | aaaf3ebef68fd377c55d1fe023f81cd2c77f151e (diff) |
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.vue | 2 | ||||
-rw-r--r-- | spec/javascripts/sidebar/confidential_issue_sidebar_spec.js | 2 |
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); }); |