diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 00:16:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 00:16:25 +0300 |
commit | faf60c19a9a1a29ce07d1b51ea3a69466e7129f3 (patch) | |
tree | 8ba3c836fd5ce4431e83301cefe9d9c0c9827c10 /app | |
parent | 054c9f71bc79eea35d482c4c53bff34214c5deaa (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
6 files changed, 44 insertions, 21 deletions
diff --git a/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue index 6e9a705c046..5fd9f7cfd4f 100644 --- a/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue @@ -2,7 +2,12 @@ import { GlLoadingIcon } from '@gitlab/ui'; // eslint-disable-next-line no-restricted-imports import { mapActions, mapGetters, mapState } from 'vuex'; -import { getParameterValues } from '~/lib/utils/url_utility'; +import { + getParameterValues, + updateHistory, + setUrlParams, + removeParams, +} from '~/lib/utils/url_utility'; import EmptyState from './empty_state.vue'; import TestSuiteTable from './test_suite_table.vue'; import TestSummary from './test_summary.vue'; @@ -49,12 +54,28 @@ export default { ]), summaryBackClick() { this.removeSelectedSuiteIndex(); + + updateHistory({ + url: removeParams(['job_name']), + title: document.title, + replace: true, + }); }, summaryTableRowClick(index) { this.setSelectedSuiteIndex(index); // Fetch the test suite when the user clicks to see more details this.fetchTestSuite(index); + + const urlParams = { + job_name: this.getSelectedSuite.name, + }; + + updateHistory({ + url: setUrlParams(urlParams), + title: document.title, + replace: true, + }); }, beforeEnterTransition() { document.documentElement.style.overflowX = 'hidden'; diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 9aaae960b6f..77ce5ea5910 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -352,7 +352,7 @@ export default { </template> </gl-sprintf> </div> - <div class="flash-container timeline-content"></div> + <div class="flash-container"></div> <form :data-line-code="lineCode" class="edit-note common-note-form js-quick-submit gfm-form"> <comment-field-layout :noteable-data="getNoteableData" :is-internal-note="isInternalNote"> <markdown-editor diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 6b4f1478978..56667c10752 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -96,14 +96,6 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25); } } -@include media-breakpoint-down(sm) { - ul.notes { - .flash-container.timeline-content { - margin-left: 0; - } - } -} - .gl-browser-ie .flash-container { position: fixed; max-width: $limited-layout-width; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 8792c7f9a72..483d151adab 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -88,18 +88,18 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; margin-top: 5px; } - .timeline-content:not(.flash-container) { + .timeline-content { margin-left: 2.5rem; border: 1px solid $border-color; border-radius: $gl-border-radius-base; padding: $gl-padding-4 $gl-padding-8; } - &:not(.target) .timeline-content:not(.flash-container) { + &:not(.target) .timeline-content { background-color: $white; } - &.draft-note .timeline-content:not(.flash-container) { + &.draft-note .timeline-content { border: 0; } @@ -127,7 +127,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; margin-top: 5px; } - .timeline-content:not(.flash-container) { + .timeline-content { margin-left: 2.5rem; border-left: 1px solid $border-color; border-right: 1px solid $border-color; @@ -138,11 +138,11 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; } } - &:not(.target) .timeline-content:not(.flash-container) { + &:not(.target) .timeline-content { background-color: $white; } - &.draft-note .timeline-content:not(.flash-container) { + &.draft-note .timeline-content { margin-left: 0; border-top-left-radius: 0; border-top-right-radius: 0; @@ -154,7 +154,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; border-right: 1px solid $border-color; background-color: $white; - .timeline-content:not(.flash-container) { + .timeline-content { padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 18px; } @@ -1057,7 +1057,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; padding-left: 0; ul.notes li.note-wrapper { - .timeline-content:not(.flash-container) { + .timeline-content { padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; } @@ -1106,7 +1106,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; } .draft-note-component.draft-note.timeline-entry { - .timeline-content:not(.flash-container) { + .timeline-content { padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; } diff --git a/app/services/ci/unlock_pipeline_service.rb b/app/services/ci/unlock_pipeline_service.rb index 88d4a8fd0be..bd42871ffbe 100644 --- a/app/services/ci/unlock_pipeline_service.rb +++ b/app/services/ci/unlock_pipeline_service.rb @@ -84,7 +84,7 @@ module Ci def unlock_job_artifacts start = Time.current - pipeline.builds.each_batch(of: BATCH_SIZE) do |builds| + builds_relation.each_batch(of: BATCH_SIZE) do |builds| # rubocop: disable CodeReuse/ActiveRecord Ci::JobArtifact.where(job_id: builds.pluck(:id)).each_batch(of: BATCH_SIZE) do |job_artifacts| unlocked_count = Ci::JobArtifact @@ -100,6 +100,16 @@ module Ci end end + # Removes the partition_id filter from the query until we get more data in the + # second partition. + def builds_relation + if Feature.enabled?(:disable_ci_partition_pruning, pipeline.project, type: :wip) + Ci::Build.in_pipelines(pipeline) + else + pipeline.builds + end + end + def unlock_pipeline_artifacts @unlocked_pipeline_artifacts_count = pipeline.pipeline_artifacts.update_all(locked: :unlocked) end diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index 343a8597444..969ca2084d7 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -10,7 +10,7 @@ .notes.notes-form.timeline .timeline-entry.note-form .timeline-entry-inner - .flash-container.timeline-content + .flash-container .timeline-content.timeline-content-form = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete |