summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-08-16 17:59:20 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-08-16 17:59:20 +0000
commit72d5165bd57472692c77d6a9d159e65058513bf3 (patch)
tree3b7a760399b60945dbdd192c5ce3721928235d89
parent3367fb3137c396e277ae8ba332bb202c9dcfe86a (diff)
parente9f85bf17973d7baaee43c3562473b00885de410 (diff)
downloadgitlab-ce-72d5165bd57472692c77d6a9d159e65058513bf3.tar.gz
Merge branch '36450_second_touch_up' into 'master'
Change 'This issue is not confidential' to 'Not confidential' See merge request !13607
-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 cfacba09fad..8e7abdbffef 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>
- This issue is not confidential
+ 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 2e16adffb5b..88a33caf2e3 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('This issue is not confidential'),
+ vm2.$el.innerHTML.includes('Not confidential'),
).toBe(true);
});