Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9895b66a
Commit
9895b66a
authored
Oct 17, 2019
by
shampton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix frontend to use callout component
Use `v-html` in a div, utilizing the slot of the callout component.
parent
2274ee25
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+5
-5
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
9895b66a
...
@@ -6,6 +6,7 @@ import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
...
@@ -6,6 +6,7 @@ import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
import
{
polyfillSticky
}
from
'
~/lib/utils/sticky
'
;
import
{
polyfillSticky
}
from
'
~/lib/utils/sticky
'
;
import
bp
from
'
~/breakpoints
'
;
import
bp
from
'
~/breakpoints
'
;
import
CiHeader
from
'
~/vue_shared/components/header_ci_component.vue
'
;
import
CiHeader
from
'
~/vue_shared/components/header_ci_component.vue
'
;
import
Callout
from
'
~/vue_shared/components/callout.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
createStore
from
'
../store
'
;
import
createStore
from
'
../store
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
...
@@ -24,6 +25,7 @@ export default {
...
@@ -24,6 +25,7 @@ export default {
store
:
createStore
(),
store
:
createStore
(),
components
:
{
components
:
{
CiHeader
,
CiHeader
,
Callout
,
EmptyState
,
EmptyState
,
EnvironmentsBlock
,
EnvironmentsBlock
,
ErasedBlock
,
ErasedBlock
,
...
@@ -237,11 +239,9 @@ export default {
...
@@ -237,11 +239,9 @@ export default {
/>
/>
</div>
</div>
<div
<callout
v-if=
"shouldRenderCalloutMessage && !hasUnmetPrerequisitesFailure"
>
v-if=
"shouldRenderCalloutMessage && !hasUnmetPrerequisitesFailure"
<div
v-html=
"job.callout_message"
></div>
class=
"bs-callout bs-callout-danger"
</callout>
v-html=
"job.callout_message"
></div>
</header>
</header>
<!-- EO Header Section -->
<!-- EO Header Section -->
...
...
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