From 1d4597596530af4e651048c14ab7e977cda38a2a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 9 Feb 2022 18:16:19 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../merge_request_templates/Deprecations.md | 1 + .gitlab/merge_request_templates/Removals.md | 1 + .../issues/show/components/description.vue | 13 +- app/assets/javascripts/issues/show/index.js | 3 + .../project_work_item_types.query.graphql | 11 + app/assets/javascripts/work_items/index.js | 4 + .../work_items/pages/create_work_item.vue | 74 ++++++- app/graphql/mutations/issues/create.rb | 15 ++ app/services/boards/base_item_move_service.rb | 2 +- app/services/issuable_base_service.rb | 2 +- app/services/issues/base_service.rb | 18 ++ app/services/issues/create_service.rb | 2 + app/services/issues/reorder_service.rb | 2 +- app/services/issues/update_service.rb | 18 -- app/views/projects/ci/lints/show.html.haml | 2 +- .../_pipeline_schedule.html.haml | 2 +- .../issue_type/_details_content.html.haml | 2 +- doc/administration/get_started.md | 2 +- doc/api/container_registry.md | 26 +++ doc/api/graphql/reference/index.md | 2 + doc/api/lint.md | 2 +- .../github_integration.md | 2 +- doc/ci/img/ci_lint.png | Bin 11525 -> 0 bytes doc/ci/img/ci_lint_dry_run.png | Bin 6811 -> 0 bytes doc/ci/lint.md | 66 +++--- doc/ci/troubleshooting.md | 2 +- doc/development/documentation/structure.md | 8 +- doc/development/sidekiq/idempotent_jobs.md | 24 -- doc/development/sidekiq/worker_attributes.md | 7 +- doc/integration/github.md | 169 +++++++------- doc/user/clusters/agent/index.md | 208 ++++++++---------- locale/gitlab.pot | 15 +- qa/qa/page/merge_request/show.rb | 3 +- .../merge_when_pipeline_succeeds_spec.rb | 6 +- spec/frontend/work_items/mock_data.js | 14 ++ .../work_items/pages/create_work_item_spec.js | 60 ++++- spec/frontend/work_items/router_spec.js | 10 + .../graphql/mutations/issues/create_spec.rb | 17 ++ spec/services/issues/create_service_spec.rb | 17 ++ 39 files changed, 523 insertions(+), 309 deletions(-) create mode 100644 app/assets/javascripts/work_items/graphql/project_work_item_types.query.graphql delete mode 100644 doc/ci/img/ci_lint.png delete mode 100644 doc/ci/img/ci_lint_dry_run.png diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md index f8803768d88..fc803152efb 100644 --- a/.gitlab/merge_request_templates/Deprecations.md +++ b/.gitlab/merge_request_templates/Deprecations.md @@ -1,6 +1,7 @@ /label ~"release post" ~"release post item" ~"Technical Writing" ~devops:: ~group:: ~"release post item::deprecation" +/label ~"type::maintenance" /milestone % /assign `@EM/PM` (choose the DRI; remove backticks here, and below) diff --git a/.gitlab/merge_request_templates/Removals.md b/.gitlab/merge_request_templates/Removals.md index c169cd87ac7..9d3738f63b5 100644 --- a/.gitlab/merge_request_templates/Removals.md +++ b/.gitlab/merge_request_templates/Removals.md @@ -1,6 +1,7 @@ /label ~"release post" ~"release post item" ~"Technical Writing" ~devops:: ~group:: ~"release post item::removal" +/label ~"type::maintenance" /milestone % /assign `@EM/PM` (choose the DRI; remove backticks here, and below) diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index 3f42f825866..bcbcb04132b 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -95,7 +95,7 @@ export default { this.renderGFM(); this.updateTaskStatusText(); - if (this.workItemsEnabled) { + if (this.workItemsEnabled && this.$el) { this.renderTaskActions(); } }, @@ -174,8 +174,11 @@ export default { ); button.id = `js-task-button-${index}`; this.taskButtons.push(button.id); - button.innerHTML = - ''; + button.innerHTML = ` + + `; item.prepend(button); }); }, @@ -191,7 +194,7 @@ export default { const taskBadge = document.createElement('span'); taskBadge.innerHTML = ` ${__('Task')} @@ -245,7 +248,7 @@ export default { modal-id="create-task-modal" :title="s__('WorkItem|New Task')" hide-footer - body-class="gl-py-0!" + body-class="gl-p-0!" > { const el = document.querySelector('#js-work-items'); + const { fullPath } = el.dataset; return new Vue({ el, router: createRouter(el.dataset.fullPath), apolloProvider: createApolloProvider(), + provide: { + fullPath, + }, render(createElement) { return createElement(App); }, diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue index 2b9db3e3db5..6c3bcf8f6a8 100644 --- a/app/assets/javascripts/work_items/pages/create_work_item.vue +++ b/app/assets/javascripts/work_items/pages/create_work_item.vue @@ -1,6 +1,8 @@