From 46e1fdb8bbdaf149371334f1a1757ba4d68fe020 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 13 Dec 2023 18:16:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../javascripts/emoji/components/category.vue | 2 +- .../javascripts/emoji/components/emoji_group.vue | 37 +- .../repository/components/table/row.vue | 4 +- app/assets/stylesheets/framework/emojis.scss | 10 - app/controllers/jwt_controller.rb | 2 + app/graphql/mutations/work_items/delete_task.rb | 58 - app/graphql/types/issue_type.rb | 2 +- app/graphql/types/merge_request_type.rb | 2 +- app/graphql/types/mutation_type.rb | 1 - .../types/work_items/deleted_task_input_type.rb | 19 - app/models/concerns/time_trackable.rb | 8 +- app/models/deploy_token.rb | 3 +- app/models/timelog.rb | 12 + app/policies/project_policy.rb | 4 +- .../dependency_proxy_authentication_service.rb | 30 +- .../variables_base_save_service.rb | 52 + .../pipeline_schedules/variables_create_service.rb | 24 + .../pipeline_schedules/variables_update_service.rb | 24 + .../personal_access_tokens/rotate_service.rb | 44 +- .../project_access_tokens/rotate_service.rb | 58 + app/services/work_items/delete_task_service.rb | 45 - .../task_list_reference_removal_service.rb | 56 - .../json_schemas/cyclonedx/bom-1.4.schema.json | 2614 +++++++++++ .../json_schemas/cyclonedx/bom-1.5.schema.json | 4895 ++++++++++++++++++++ app/validators/json_schemas/cyclonedx_report.json | 2614 ----------- app/views/admin/dashboard/stats.html.haml | 2 +- .../projects/merge_requests/_nav_btns.html.haml | 2 +- 27 files changed, 7762 insertions(+), 2862 deletions(-) delete mode 100644 app/graphql/mutations/work_items/delete_task.rb delete mode 100644 app/graphql/types/work_items/deleted_task_input_type.rb create mode 100644 app/services/ci/pipeline_schedules/variables_base_save_service.rb create mode 100644 app/services/ci/pipeline_schedules/variables_create_service.rb create mode 100644 app/services/ci/pipeline_schedules/variables_update_service.rb create mode 100644 app/services/project_access_tokens/rotate_service.rb delete mode 100644 app/services/work_items/delete_task_service.rb delete mode 100644 app/services/work_items/task_list_reference_removal_service.rb create mode 100644 app/validators/json_schemas/cyclonedx/bom-1.4.schema.json create mode 100644 app/validators/json_schemas/cyclonedx/bom-1.5.schema.json delete mode 100644 app/validators/json_schemas/cyclonedx_report.json (limited to 'app') diff --git a/app/assets/javascripts/emoji/components/category.vue b/app/assets/javascripts/emoji/components/category.vue index 80850475b96..d8607cbc60b 100644 --- a/app/assets/javascripts/emoji/components/category.vue +++ b/app/assets/javascripts/emoji/components/category.vue @@ -52,7 +52,7 @@ export default { :key="index" :emojis="emojiGroup" :render-group="renderGroup" - @emoji-click="onClick" + :click-emoji="(emoji) => onClick(emoji)" />

diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue index bb0c3b0a694..bbac6866636 100644 --- a/app/assets/javascripts/emoji/components/emoji_group.vue +++ b/app/assets/javascripts/emoji/components/emoji_group.vue @@ -1,10 +1,10 @@ -