diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 21:09:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 21:09:24 +0000 |
| commit | 58c1969d4a05cd3bf4b0b96da7cbd219d58d6328 (patch) | |
| tree | ca81061558056547698cc5794554cc9c564a5c69 /app | |
| parent | d551c55bb0e691f06655bcda5fe9566164fd3e46 (diff) | |
| download | gitlab-ce-58c1969d4a05cd3bf4b0b96da7cbd219d58d6328.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notebook/cells/output/html.vue | 6 | ||||
| -rw-r--r-- | app/graphql/types/ci/stage_type.rb | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/notebook/cells/output/html.vue b/app/assets/javascripts/notebook/cells/output/html.vue index dc5b2b66348..c8d4e6de39b 100644 --- a/app/assets/javascripts/notebook/cells/output/html.vue +++ b/app/assets/javascripts/notebook/cells/output/html.vue @@ -1,6 +1,5 @@ <script> import { GlSafeHtmlDirective } from '@gitlab/ui'; -import { sanitize } from '~/lib/dompurify'; import Prompt from '../prompt.vue'; export default { @@ -25,9 +24,6 @@ export default { }, }, computed: { - sanitizedOutput() { - return sanitize(this.rawCode); - }, showOutput() { return this.index === 0; }, @@ -38,6 +34,6 @@ export default { <template> <div class="output"> <prompt type="Out" :count="count" :show-output="showOutput" /> - <div v-safe-html="sanitizedOutput" class="gl-overflow-auto"></div> + <div v-safe-html="rawCode" class="gl-overflow-auto"></div> </div> </template> diff --git a/app/graphql/types/ci/stage_type.rb b/app/graphql/types/ci/stage_type.rb index 7b35eab3d27..57b64cb7ba5 100644 --- a/app/graphql/types/ci/stage_type.rb +++ b/app/graphql/types/ci/stage_type.rb @@ -17,7 +17,8 @@ module Types description: 'Detailed status of the stage.' field :jobs, Ci::JobType.connection_type, null: true, description: 'Jobs for the stage.', - method: 'latest_statuses' + method: 'latest_statuses', + max_page_size: 200 field :status, GraphQL::Types::String, null: true, description: 'Status of the pipeline stage.' |