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
b5e7de21
Commit
b5e7de21
authored
Oct 30, 2020
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/security/gitlab@13-5-stable-ee
parent
fa2fec1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+5
-3
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+1
-1
changelogs/unreleased/security-stored-xss-build-dependencies.yml
...ogs/unreleased/security-stored-xss-build-dependencies.yml
+5
-0
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
b5e7de21
<
script
>
<
script
>
/* eslint-disable vue/no-v-html */
import
{
throttle
,
isEmpty
}
from
'
lodash
'
;
import
{
throttle
,
isEmpty
}
from
'
lodash
'
;
import
{
mapGetters
,
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
mapGetters
,
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
GlLoadingIcon
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlIcon
,
GlSafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
{
GlBreakpointInstance
as
bp
}
from
'
@gitlab/ui/dist/utils
'
;
import
{
GlBreakpointInstance
as
bp
}
from
'
@gitlab/ui/dist/utils
'
;
import
{
isScrolledToBottom
}
from
'
~/lib/utils/scroll_utils
'
;
import
{
isScrolledToBottom
}
from
'
~/lib/utils/scroll_utils
'
;
import
{
polyfillSticky
}
from
'
~/lib/utils/sticky
'
;
import
{
polyfillSticky
}
from
'
~/lib/utils/sticky
'
;
...
@@ -36,6 +35,9 @@ export default {
...
@@ -36,6 +35,9 @@ export default {
GlLoadingIcon
,
GlLoadingIcon
,
SharedRunner
:
()
=>
import
(
'
ee_component/jobs/components/shared_runner_limit_block.vue
'
),
SharedRunner
:
()
=>
import
(
'
ee_component/jobs/components/shared_runner_limit_block.vue
'
),
},
},
directives
:
{
SafeHtml
,
},
mixins
:
[
delayedJobMixin
],
mixins
:
[
delayedJobMixin
],
props
:
{
props
:
{
artifactHelpUrl
:
{
artifactHelpUrl
:
{
...
@@ -223,7 +225,7 @@ export default {
...
@@ -223,7 +225,7 @@ export default {
</div>
</div>
<callout
v-if=
"shouldRenderHeaderCallout"
>
<callout
v-if=
"shouldRenderHeaderCallout"
>
<div
v-html=
"job.callout_message"
></div>
<div
v-
safe-
html=
"job.callout_message"
></div>
</callout>
</callout>
</header>
</header>
<!-- EO Header Section -->
<!-- EO Header Section -->
...
...
app/serializers/build_details_entity.rb
View file @
b5e7de21
...
@@ -136,7 +136,7 @@ class BuildDetailsEntity < JobEntity
...
@@ -136,7 +136,7 @@ class BuildDetailsEntity < JobEntity
docs_url
=
"https://docs.gitlab.com/ee/ci/yaml/README.html#dependencies"
docs_url
=
"https://docs.gitlab.com/ee/ci/yaml/README.html#dependencies"
[
[
failure_message
.
html_safe
,
failure_message
,
help_message
(
docs_url
).
html_safe
help_message
(
docs_url
).
html_safe
].
join
(
"<br />"
)
].
join
(
"<br />"
)
end
end
...
...
changelogs/unreleased/security-stored-xss-build-dependencies.yml
0 → 100644
View file @
b5e7de21
---
title
:
Fix XSS vulnerability for job build dependencies
merge_request
:
author
:
type
:
security
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