From fc4faf47ac4e5f1ddc40640c42c32405c38c9455 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 May 2023 12:07:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../components/alert_mapping_builder.vue | 6 +- .../content_editor/components/content_editor.vue | 11 ++- .../components/formatting_toolbar.vue | 8 +++ .../javascripts/pages/admin/topics/edit/index.js | 5 +- .../javascripts/pages/admin/topics/new/index.js | 5 +- .../commit_box/info/components/commit_refs.vue | 7 ++ .../commit_box/info/components/refs_list.vue | 26 +++++-- .../components/markdown/markdown_editor.vue | 15 +++- .../components/markdown/mount_markdown_editor.js | 10 ++- .../page_bundles/alert_management_settings.scss | 8 --- app/controllers/admin/groups_controller.rb | 2 +- app/controllers/admin/projects_controller.rb | 2 +- app/controllers/admin/topics/avatars_controller.rb | 2 +- app/controllers/admin/topics_controller.rb | 6 +- app/controllers/autocomplete_controller.rb | 2 +- app/controllers/dashboard/groups_controller.rb | 2 +- app/controllers/dashboard/projects_controller.rb | 2 +- app/controllers/explore/groups_controller.rb | 2 +- app/controllers/explore/projects_controller.rb | 2 +- .../groups/autocomplete_sources_controller.rb | 2 +- app/controllers/groups/avatars_controller.rb | 2 +- app/controllers/groups/children_controller.rb | 2 +- app/controllers/groups/group_links_controller.rb | 2 +- app/controllers/groups/group_members_controller.rb | 2 +- .../groups/shared_projects_controller.rb | 2 +- app/controllers/groups/uploads_controller.rb | 2 +- app/controllers/groups_controller.rb | 6 +- app/controllers/projects/avatars_controller.rb | 2 +- app/controllers/projects/blame_controller.rb | 5 ++ app/controllers/projects/group_links_controller.rb | 2 +- .../projects/project_members_controller.rb | 2 +- app/controllers/projects/redirect_controller.rb | 2 +- app/controllers/projects/starrers_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 +- app/graphql/types/ci/job_artifact_type.rb | 2 +- app/models/packages/package.rb | 4 ++ app/models/plan_limits.rb | 1 + .../packages/debian/create_package_file_service.rb | 10 +-- .../debian/extract_changes_metadata_service.rb | 7 +- .../debian/process_package_file_service.rb | 81 ++++++++++++++++++---- app/views/admin/topics/_form.html.haml | 17 ++--- app/workers/all_queues.yml | 10 +-- .../disallow_two_factor_for_group_worker.rb | 2 +- .../disallow_two_factor_for_subgroups_worker.rb | 2 +- app/workers/group_destroy_worker.rb | 2 +- .../member_invitation_reminder_emails_worker.rb | 2 +- .../packages/debian/process_package_file_worker.rb | 2 +- .../projects/record_target_platforms_worker.rb | 2 +- 48 files changed, 210 insertions(+), 94 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue index 1a586bd1e91..bc4df04cb30 100644 --- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue +++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue @@ -159,8 +159,10 @@ export default {
-
- +
+
diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index beb3497e250..92f3c3fb8fa 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -90,6 +90,11 @@ export default { required: false, default: () => ({}), }, + disableAttachments: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -223,7 +228,11 @@ export default { class="md-area gl-border-none! gl-shadow-none!" :class="{ 'is-focused': focused }" > - +
{{ placeholder }}
diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue index fac259cf6a1..89d7a2c958c 100644 --- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue +++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue @@ -16,6 +16,13 @@ export default { ToolbarMoreDropdown, EditorModeSwitcher, }, + props: { + hideAttachmentButton: { + type: Boolean, + default: false, + required: false, + }, + }, methods: { trackToolbarControlExecution({ contentType, value }) { trackUIControl({ property: contentType, value }); @@ -114,6 +121,7 @@ export default { /> diff --git a/app/assets/javascripts/pages/admin/topics/edit/index.js b/app/assets/javascripts/pages/admin/topics/edit/index.js index b2cbd52fb27..901fd9193a5 100644 --- a/app/assets/javascripts/pages/admin/topics/edit/index.js +++ b/app/assets/javascripts/pages/admin/topics/edit/index.js @@ -1,11 +1,10 @@ -import $ from 'jquery'; -import GLForm from '~/gl_form'; import initFilePickers from '~/file_pickers'; import ZenMode from '~/zen_mode'; import { initRemoveAvatar } from '~/admin/topics'; +import { mountMarkdownEditor } from '~/vue_shared/components/markdown/mount_markdown_editor'; -new GLForm($('.js-project-topic-form')); // eslint-disable-line no-new initFilePickers(); new ZenMode(); // eslint-disable-line no-new initRemoveAvatar(); +mountMarkdownEditor(); diff --git a/app/assets/javascripts/pages/admin/topics/new/index.js b/app/assets/javascripts/pages/admin/topics/new/index.js index c4e05bbd092..fc9ca4fd4e6 100644 --- a/app/assets/javascripts/pages/admin/topics/new/index.js +++ b/app/assets/javascripts/pages/admin/topics/new/index.js @@ -1,8 +1,7 @@ -import $ from 'jquery'; -import GLForm from '~/gl_form'; import initFilePickers from '~/file_pickers'; import ZenMode from '~/zen_mode'; +import { mountMarkdownEditor } from '~/vue_shared/components/markdown/mount_markdown_editor'; -new GLForm($('.js-project-topic-form')); // eslint-disable-line no-new initFilePickers(); new ZenMode(); // eslint-disable-line no-new +mountMarkdownEditor(); diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue index 936938f3032..4258332ed6e 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue @@ -1,5 +1,6 @@