diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-15 03:17:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-15 03:17:14 +0300 |
commit | ff45b1aea7367cf98a5b70e8324e4826c119bf87 (patch) | |
tree | f61097483afa71348c5e331066b68570702a5cda /app | |
parent | eaa1d6fdd776adb3df4a820d3b66588541fd2710 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
11 files changed, 23 insertions, 33 deletions
diff --git a/app/assets/javascripts/ci/catalog/components/details/ci_resource_about.vue b/app/assets/javascripts/ci/catalog/components/details/ci_resource_about.vue index 572a8183730..349ce761d25 100644 --- a/app/assets/javascripts/ci/catalog/components/details/ci_resource_about.vue +++ b/app/assets/javascripts/ci/catalog/components/details/ci_resource_about.vue @@ -101,7 +101,7 @@ export default { <span v-for="item in projectInfoItems" :key="`${item.icon}`" - class="gl-display-flex gl-align-items-center gl-xs-mb-3" + class="gl-display-flex gl-align-items-center gl-mb-3 gl-sm-mb-0" > <gl-icon class="gl-text-primary gl-mr-2" :name="item.icon" /> <div diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue index d48bea3616d..6dc8e8baf0e 100644 --- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue +++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue @@ -335,7 +335,7 @@ export default { class="gl-m-0 gl-w-full gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row-reverse" > <gl-button - class="gl-w-full gl-sm-w-auto gl-xs-mb-3! gl-sm-ml-3!" + class="gl-w-full gl-sm-w-auto gl-sm-ml-3!" data-testid="invite-modal-submit" v-bind="actionPrimary.attributes" @click="onSubmit" diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index f8a0db93e37..9aaae960b6f 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -435,7 +435,7 @@ export default { category="primary" variant="confirm" data-testid="reply-comment-button" - class="gl-sm-mr-3 gl-xs-mb-3 js-vue-issue-save js-comment-button" + class="gl-sm-mr-3 gl-mb-3 gl-sm-mb-0 js-vue-issue-save js-comment-button" @click="handleUpdate()" > {{ saveButtonTitle }} diff --git a/app/assets/javascripts/vue_shared/components/registry/list_item.vue b/app/assets/javascripts/vue_shared/components/registry/list_item.vue index 451b5e8d648..868e348adc0 100644 --- a/app/assets/javascripts/vue_shared/components/registry/list_item.vue +++ b/app/assets/javascripts/vue_shared/components/registry/list_item.vue @@ -72,7 +72,9 @@ export default { <div class="gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-justify-content-space-between gl-align-items-stretch gl-flex-grow-1" > - <div class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1"> + <div + class="gl-display-flex gl-flex-direction-column gl-mb-3 gl-sm-mb-0 gl-min-w-0 gl-flex-grow-1" + > <div v-if=" $slots['left-primary'] /* eslint-disable-line @gitlab/vue-prefer-dollar-scopedslots */ diff --git a/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue b/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue index e090d3e30f3..45d49e5339a 100644 --- a/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue +++ b/app/assets/javascripts/vue_shared/components/usage_quotas/usage_banner.vue @@ -23,7 +23,9 @@ export default { <div class="gl-display-flex gl-flex-direction-column gl-sm-flex-direction-row gl-justify-content-space-between gl-align-items-stretch gl-flex-grow-1" > - <div class="gl-display-flex gl-flex-direction-column gl-xs-mb-3 gl-min-w-0 gl-flex-grow-1"> + <div + class="gl-display-flex gl-flex-direction-column gl-mb-3 gl-sm-mb-0 gl-min-w-0 gl-flex-grow-1" + > <div v-if=" /* eslint-disable-line @gitlab/vue-prefer-dollar-scopedslots */ $slots[ diff --git a/app/assets/stylesheets/tmp_utilities.scss b/app/assets/stylesheets/tmp_utilities.scss index 5f7358aed8f..c8144e97693 100644 --- a/app/assets/stylesheets/tmp_utilities.scss +++ b/app/assets/stylesheets/tmp_utilities.scss @@ -35,4 +35,10 @@ @include gl-media-breakpoint-up(sm) { flex-direction: row-reverse; } -}
\ No newline at end of file +} + +.gl-sm-mb-0 { + @include gl-media-breakpoint-up(sm) { + margin-bottom: 0; + } +} diff --git a/app/models/concerns/enums/package_metadata.rb b/app/models/concerns/enums/package_metadata.rb index 352eb41829b..28738dcabe8 100644 --- a/app/models/concerns/enums/package_metadata.rb +++ b/app/models/concerns/enums/package_metadata.rb @@ -2,22 +2,6 @@ module Enums class PackageMetadata - PURL_TYPES = { - composer: 1, - conan: 2, - gem: 3, - golang: 4, - maven: 5, - npm: 6, - nuget: 7, - pypi: 8, - apk: 9, - rpm: 10, - deb: 11, - 'cbl-mariner': 12, - wolfi: 13 - }.with_indifferent_access.freeze - ADVISORY_SOURCES = { glad: 1, # gitlab advisory db trivy: 2 @@ -33,14 +17,6 @@ module Enums v2: 2 }.with_indifferent_access.freeze - def self.purl_types - PURL_TYPES - end - - def self.purl_types_numerical - purl_types.invert - end - def self.advisory_sources ADVISORY_SOURCES end diff --git a/app/models/concerns/enums/sbom.rb b/app/models/concerns/enums/sbom.rb index af8e37b4248..9c3bbc92e86 100644 --- a/app/models/concerns/enums/sbom.rb +++ b/app/models/concerns/enums/sbom.rb @@ -31,5 +31,9 @@ module Enums # consumers from producing invalid SQL caused by null entries @_purl_types ||= PURL_TYPES.dup.tap { |h| h.default = 0 } end + + def self.purl_types_numerical + purl_types.invert + end end end diff --git a/app/services/bulk_imports/batched_relation_export_service.rb b/app/services/bulk_imports/batched_relation_export_service.rb index c7c01c80fbf..9c3b237fad7 100644 --- a/app/services/bulk_imports/batched_relation_export_service.rb +++ b/app/services/bulk_imports/batched_relation_export_service.rb @@ -26,7 +26,7 @@ module BulkImports start_export! export.batches.destroy_all # rubocop: disable Cop/DestroyAll enqueue_batch_exports - ensure + FinishBatchedRelationExportWorker.perform_async(export.id) end diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 42482a773be..be0e5a428b4 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -19,7 +19,7 @@ #{time_ago_with_tooltip(@commit.committed_date)} #js-commit-comments-button{ data: { comments_count: @notes_count.to_i } } - = link_button_to _('Browse files'), project_tree_path(@project, @commit), class: 'gl-mr-3 gl-w-full gl-sm-w-auto gl-xs-mb-3' + = link_button_to _('Browse files'), project_tree_path(@project, @commit), class: 'gl-mr-3 gl-w-full gl-sm-w-auto gl-mb-3 gl-sm-mb-0' #js-commit-options-dropdown{ data: commit_options_dropdown_data(@project, @commit) } .commit-box{ data: { project_path: project_path(@project) } } diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index 997e7b7f24d..4f7fed2ac2c 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -6,7 +6,7 @@ - blob_path = project_blob_path(@project, @ref) .file-finder-holder.tree-holder.clearfix.js-file-finder.gl-pt-4{ data: { file_find_url: "#{escape_javascript(project_files_path(@project, @ref, ref_type: @ref_type, format: :json))}", find_tree_url: escape_javascript(tree_path), blob_url_template: escape_javascript(blob_path), ref_type: @ref_type } } .nav-block.gl-xs-mr-0 - .tree-ref-holder.gl-xs-mb-3.gl-max-w-26 + .tree-ref-holder.gl-mb-3.gl-sm-mb-0.gl-max-w-26 #js-blob-ref-switcher{ data: { project_id: @project.id, ref: @ref, ref_type: @ref_type, namespace: "/-/find_file" } } %ul.breadcrumb.repo-breadcrumb.gl-flex-nowrap %li.breadcrumb-item.gl-white-space-nowrap |