From 1c7a88b121670eb5732ff4ddac3a2121fb36395a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 1 Apr 2022 18:08:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/global.gitlab-ci.yml | 4 +- .gitlab/ci/rails.gitlab-ci.yml | 4 +- app/assets/javascripts/lib/utils/text_markdown.js | 7 +- .../components/assignees/assignees_realtime.vue | 43 +- .../assignees/sidebar_assignees_widget.vue | 1 + .../assignees/uncollapsed_assignee_list.vue | 19 +- .../reviewers/uncollapsed_reviewer_list.vue | 18 +- .../queries/issuable_labels.subscription.graphql | 22 + .../labels_select_widget/labels_select_root.vue | 50 +- app/assets/stylesheets/framework/sidebar.scss | 20 + app/assets/stylesheets/framework/tables.scss | 2 +- app/controllers/groups/boards_controller.rb | 1 + app/controllers/projects/boards_controller.rb | 1 + app/controllers/projects/issues_controller.rb | 1 + .../projects/merge_requests_controller.rb | 1 + app/controllers/projects_controller.rb | 4 +- app/graphql/graphql_triggers.rb | 4 + app/graphql/types/subscription_type.rb | 3 + app/models/merge_request.rb | 10 +- app/services/environments/stop_service.rb | 2 +- app/services/issuable_base_service.rb | 11 + app/services/issues/update_service.rb | 1 + app/services/merge_requests/base_service.rb | 2 +- app/services/merge_requests/update_service.rb | 1 + .../migration/enqueuer_worker.rb | 12 +- ...fix_related_environments_for_merge_requests.yml | 8 + .../feature_flags/development/realtime_labels.yml | 8 + .../development/vsa_consistency_worker.yml | 4 +- doc/administration/gitaly/configure_gitaly.md | 5 +- lib/gitlab/setup_helper.rb | 6 +- locale/am_ET/gitlab.po | 2095 +- locale/ar_SA/gitlab.po | 2143 +- locale/as_IN/gitlab.po | 2091 +- locale/az_AZ/gitlab.po | 2091 +- locale/ba_RU/gitlab.po | 2078 +- locale/bg/gitlab.po | 2091 +- locale/bn_BD/gitlab.po | 2091 +- locale/bn_IN/gitlab.po | 2091 +- locale/br_FR/gitlab.po | 2130 +- locale/bs_BA/gitlab.po | 2106 +- locale/ca_ES/gitlab.po | 2091 +- locale/cs_CZ/gitlab.po | 2117 +- locale/cy_GB/gitlab.po | 2143 +- locale/da_DK/gitlab.po | 2145 +- locale/de/gitlab.po | 2197 +- locale/el_GR/gitlab.po | 2091 +- locale/eo/gitlab.po | 2091 +- locale/es/gitlab.po | 2147 +- locale/et_EE/gitlab.po | 2091 +- locale/fa_IR/gitlab.po | 2091 +- locale/fi_FI/gitlab.po | 2091 +- locale/fil_PH/gitlab.po | 2091 +- locale/fr/gitlab.po | 2103 +- locale/gl_ES/gitlab.po | 2091 +- locale/he_IL/gitlab.po | 2117 +- locale/hi_IN/gitlab.po | 2091 +- locale/hr_HR/gitlab.po | 2104 +- locale/hu_HU/gitlab.po | 2091 +- locale/hy_AM/gitlab.po | 2091 +- locale/id_ID/gitlab.po | 2078 +- locale/ig_NG/gitlab.po | 2078 +- locale/is_IS/gitlab.po | 2091 +- locale/it/gitlab.po | 2091 +- locale/ja/gitlab.po | 2380 +- locale/ka_GE/gitlab.po | 2091 +- locale/kab/gitlab.po | 2091 +- locale/ko/gitlab.po | 2088 +- locale/ku_TR/gitlab.po | 2091 +- locale/ky_KG/gitlab.po | 2091 +- locale/lt_LT/gitlab.po | 2117 +- locale/mk_MK/gitlab.po | 2091 +- locale/ml_IN/gitlab.po | 45603 +++++++++++++++++++ locale/mn_MN/gitlab.po | 2091 +- locale/nb_NO/gitlab.po | 2121 +- locale/nl_NL/gitlab.po | 2091 +- locale/or_IN/gitlab.po | 2091 +- locale/pa_IN/gitlab.po | 2091 +- locale/pl_PL/gitlab.po | 2117 +- locale/pt_BR/gitlab.po | 2739 +- locale/pt_PT/gitlab.po | 2093 +- locale/ro_RO/gitlab.po | 6714 +-- locale/ru/gitlab.po | 2149 +- locale/si_LK/gitlab.po | 2185 +- locale/sk_SK/gitlab.po | 2117 +- locale/sl_SI/gitlab.po | 2117 +- locale/sq_AL/gitlab.po | 2091 +- locale/sr_CS/gitlab.po | 2104 +- locale/sr_SP/gitlab.po | 2104 +- locale/sv_SE/gitlab.po | 2091 +- locale/sw_KE/gitlab.po | 2091 +- locale/ta_IN/gitlab.po | 2091 +- locale/tr_TR/gitlab.po | 2101 +- locale/uk/gitlab.po | 2363 +- locale/ur_PK/gitlab.po | 2091 +- locale/uz_UZ/gitlab.po | 2091 +- locale/vi_VN/gitlab.po | 2078 +- locale/zh_CN/gitlab.po | 3198 +- locale/zh_HK/gitlab.po | 2078 +- locale/zh_TW/gitlab.po | 2150 +- spec/controllers/projects_controller_spec.rb | 32 +- spec/factories/ci/builds.rb | 38 + .../user_sees_sidebar_updates_in_realtime_spec.rb | 37 + spec/frontend/lib/utils/text_markdown_spec.js | 8 + spec/frontend/sidebar/assignees_realtime_spec.js | 23 +- spec/frontend/sidebar/mock_data.js | 22 + .../labels_select_root_spec.js | 35 +- .../sidebar/labels_select_widget/mock_data.js | 28 + spec/graphql/graphql_triggers_spec.rb | 16 + spec/graphql/types/subscription_type_spec.rb | 1 + spec/models/merge_request_spec.rb | 4 +- spec/services/environments/stop_service_spec.rb | 24 + spec/services/issues/update_service_spec.rb | 10 + .../services/merge_requests/update_service_spec.rb | 10 + spec/support/helpers/gitaly_setup.rb | 2 +- .../issuable_update_service_shared_examples.rb | 30 + .../migration/enqueuer_worker_spec.rb | 70 +- 116 files changed, 154893 insertions(+), 41272 deletions(-) create mode 100644 app/assets/javascripts/sidebar/queries/issuable_labels.subscription.graphql create mode 100644 config/feature_flags/development/fix_related_environments_for_merge_requests.yml create mode 100644 config/feature_flags/development/realtime_labels.yml create mode 100644 locale/ml_IN/gitlab.po diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index f1c62e01674..96f81a7feee 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -49,8 +49,8 @@ - tmp/tests/gitaly/config.toml - tmp/tests/gitaly/gitaly2.config.toml - tmp/tests/gitaly/internal/ - - tmp/tests/gitaly/internal_gitaly2/ - - tmp/tests/gitaly/internal_sockets/ + - tmp/tests/gitaly/run/ + - tmp/tests/gitaly/run2/ - tmp/tests/gitaly/Makefile - tmp/tests/gitaly/praefect.config.toml - tmp/tests/gitaly/ruby/ diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index fbf335ac777..9ca125a0b2a 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -206,8 +206,8 @@ setup-test-env: - ${TMP_TEST_FOLDER}/gitaly/config.toml - ${TMP_TEST_FOLDER}/gitaly/gitaly2.config.toml - ${TMP_TEST_FOLDER}/gitaly/internal/ - - ${TMP_TEST_FOLDER}/gitaly/internal_gitaly2/ - - ${TMP_TEST_FOLDER}/gitaly/internal_sockets/ + - ${TMP_TEST_FOLDER}/gitaly/run/ + - ${TMP_TEST_FOLDER}/gitaly/run2/ - ${TMP_TEST_FOLDER}/gitaly/Makefile - ${TMP_TEST_FOLDER}/gitaly/praefect.config.toml - ${TMP_TEST_FOLDER}/gitaly/ruby/ diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js index 18eca11ac42..a5e2ee463a9 100644 --- a/app/assets/javascripts/lib/utils/text_markdown.js +++ b/app/assets/javascripts/lib/utils/text_markdown.js @@ -11,6 +11,9 @@ const LINK_TAG_PATTERN = '[{text}](url)'; // followed by one or more whitespace characters const LIST_LINE_HEAD_PATTERN = /^(?\s*)(?((?[*+-])|(?\d+\.))( \[([xX ])\])?\s)(?.)?/; +// detect a horizontal rule that might be mistaken for a list item (not full pattern for an
) +const HR_PATTERN = /^((\s{0,3}-+\s*-+\s*-+\s*[\s-]*)|(\s{0,3}\*+\s*\*+\s*\*+\s*[\s*]*))$/; + function selectedText(text, textarea) { return text.substring(textarea.selectionStart, textarea.selectionEnd); } @@ -381,13 +384,15 @@ function handleContinueList(e, textArea) { let itemToInsert; + // Behaviors specific to either `ol` or `ul` if (isOl) { const nextLine = lineAfter(textArea.value, textArea, false); const nextLineResult = nextLine.match(LIST_LINE_HEAD_PATTERN); itemToInsert = continueOlText(result, nextLineResult); } else { - // isUl + if (currentLine.match(HR_PATTERN)) return; + itemToInsert = `${indent}${leader}`; } diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue index 2387fe64b8f..78d12ac113b 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue @@ -1,6 +1,5 @@