BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fe09c25d
Commit
fe09c25d
authored
Aug 15, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '36450_confi_polish' into 'master'
Change Confidential Message When Visible - UI Polish See merge request !13551
parents
f2cae268
aaaf3ebe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
confidential_issue_sidebar.vue
...ar/components/confidential/confidential_issue_sidebar.vue
+1
-1
confidential_issue_sidebar_spec.js
spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
+1
-1
No files found.
app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
View file @
fe09c25d
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
/>
/>
<div
v-if=
"!isConfidential"
class=
"no-value confidential-value"
>
<div
v-if=
"!isConfidential"
class=
"no-value confidential-value"
>
<i
class=
"fa fa-eye is-not-confidential"
></i>
<i
class=
"fa fa-eye is-not-confidential"
></i>
None
This issue is not confidential
</div>
</div>
<div
v-else
class=
"value confidential-value hide-collapsed"
>
<div
v-else
class=
"value confidential-value hide-collapsed"
>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-eye-slash is-confidential"
></i>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-eye-slash is-confidential"
></i>
...
...
spec/javascripts/sidebar/confidential_issue_sidebar_spec.js
View file @
fe09c25d
...
@@ -41,7 +41,7 @@ describe('Confidential Issue Sidebar Block', () => {
...
@@ -41,7 +41,7 @@ describe('Confidential Issue Sidebar Block', () => {
).
toBe
(
true
);
).
toBe
(
true
);
expect
(
expect
(
vm2
.
$el
.
innerHTML
.
includes
(
'
None
'
),
vm2
.
$el
.
innerHTML
.
includes
(
'
This issue is not confidential
'
),
).
toBe
(
true
);
).
toBe
(
true
);
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment