From c3ddbeb162e4261f4ce3df291909fadeba637995 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 1 Dec 2023 15:10:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/diffs/store/actions.js | 13 +- .../javascripts/diffs/store/mutation_types.js | 1 + .../javascripts/diffs/store/mutations.js | 5 + .../issues/show/components/app.vue | 2 +- .../issues/show/components/header_actions.vue | 6 +- .../components/incidents/incident_tabs.vue | 3 +- .../issues/show/components/title.vue | 2 +- .../show/components/issuable_header.vue | 4 +- .../autocomplete_sources/expires_in.rb | 27 ++ .../groups/autocomplete_sources_controller.rb | 7 +- .../autocomplete_sources_controller.rb | 7 +- .../development/approval_group_rules.yml | 8 + .../cache_autocomplete_sources_commands.yml | 8 + .../cache_autocomplete_sources_labels.yml | 8 + ...up_level_vulnerability_report_grouping.yml | 8 + ..._templates_total_unique_counts_monthly.yml | 1 - ..._p_ci_templates_diffblue_cover_monthly.yml | 24 -- ...i_templates_total_unique_counts_weekly.yml | 1 - ...1_p_ci_templates_diffblue_cover_weekly.yml | 24 -- doc/administration/admin_area.md | 3 +- .../auth/ldap/ldap-troubleshooting.md | 6 +- .../backup_restore/migrate_to_new_server.md | 3 +- doc/administration/external_users.md | 3 +- .../background_verification.md | 3 +- .../geo/disaster_recovery/planned_failover.md | 6 +- .../runbooks/planned_failover_multi_node.md | 6 +- .../runbooks/planned_failover_single_node.md | 9 +- .../geo/replication/configuration.md | 3 +- .../geo/replication/troubleshooting.md | 2 +- .../two_single_node_external_services.md | 3 +- .../geo/setup/two_single_node_sites.md | 3 +- doc/administration/gitaly/praefect.md | 3 +- doc/administration/maintenance_mode/index.md | 6 +- .../operations/fast_ssh_key_lookup.md | 3 +- doc/administration/pages/troubleshooting.md | 3 +- .../settings/account_and_limit_settings.md | 3 +- .../settings/continuous_integration.md | 3 +- doc/administration/settings/jira_cloud_app.md | 3 +- .../settings/push_event_activities_limit.md | 3 +- doc/administration/settings/slack_app.md | 6 +- doc/administration/silent_mode/index.md | 6 +- doc/api/graphql/getting_started.md | 2 +- .../blueprints/cells/routing-service.md | 2 +- .../blueprints/gitlab_services/index.md | 8 +- .../blueprints/gitlab_steps/implementation.md | 4 +- doc/ci/runners/runners_scope.md | 3 +- doc/ci/ssh_keys/index.md | 2 +- doc/ci/testing/unit_test_reports.md | 2 +- doc/development/ai_features/glossary.md | 2 +- .../contributing/issue_workflow.md | 2 +- doc/development/ee_features.md | 6 +- .../service_ping/troubleshooting.md | 6 +- doc/integration/datadog.md | 3 +- doc/integration/gitpod.md | 3 +- doc/integration/kerberos.md | 3 +- .../cloud/aws/gitlab_aws_integration.md | 14 +- doc/update/plan_your_upgrade.md | 3 +- doc/update/versions/gitlab_16_changes.md | 2 +- doc/user/ai_features.md | 2 +- doc/user/analytics/dora_metrics.md | 2 +- .../application_security/dast/checks/94.2.md | 4 +- doc/user/clusters/management_project.md | 3 +- doc/user/custom_roles.md | 3 +- doc/user/group/saml_sso/troubleshooting.md | 2 +- doc/user/group/subgroups/index.md | 3 +- doc/user/packages/generic_packages/index.md | 4 +- doc/user/project/integrations/pumble.md | 3 +- doc/user/project/integrations/telegram.md | 3 +- doc/user/project/integrations/webex_teams.md | 3 +- .../ci/templates/Diffblue-Cover.gitlab-ci.yml | 88 ------ locale/gitlab.pot | 3 + package.json | 71 ++--- .../import/import_large_github_repo_spec.rb | 2 +- .../autocomplete_sources/expires_in_spec.rb | 69 +++++ spec/frontend/diffs/store/actions_spec.js | 43 ++- spec/frontend/diffs/store/mutations_spec.js | 11 + .../ci/templates/Diffblue_Cover_spec.rb | 26 -- .../lib/gitlab/ci/templates/templates_spec.rb | 1 - vite.config.js | 20 ++ yarn.lock | 292 +++++++++--------- 80 files changed, 486 insertions(+), 487 deletions(-) create mode 100644 app/controllers/concerns/autocomplete_sources/expires_in.rb create mode 100644 config/feature_flags/development/approval_group_rules.yml create mode 100644 config/feature_flags/development/cache_autocomplete_sources_commands.yml create mode 100644 config/feature_flags/development/cache_autocomplete_sources_labels.yml create mode 100644 config/feature_flags/development/group_level_vulnerability_report_grouping.yml delete mode 100644 config/metrics/counts_28d/20231116002424_p_ci_templates_diffblue_cover_monthly.yml delete mode 100644 config/metrics/counts_7d/20231116002421_p_ci_templates_diffblue_cover_weekly.yml delete mode 100644 lib/gitlab/ci/templates/Diffblue-Cover.gitlab-ci.yml create mode 100644 spec/controllers/concerns/autocomplete_sources/expires_in_spec.rb delete mode 100644 spec/lib/gitlab/ci/templates/Diffblue_Cover_spec.rb diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 3c7a3628a02..1c0e20183e2 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -15,6 +15,7 @@ import notesEventHub from '~/notes/event_hub'; import { generateTreeList } from '~/diffs/utils/tree_worker_utils'; import { sortTree } from '~/ide/stores/utils'; import { containsSensitiveToken, confirmSensitiveAction } from '~/lib/utils/secret_detection'; +import { isCollapsed } from '~/diffs/utils/diff_file'; import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE, @@ -73,6 +74,7 @@ import { prepareLineForRenamedFile, parseUrlHashAsFileHash, isUrlHashNoteLink, + findDiffFile, } from './utils'; export const setBaseConfig = ({ commit }, options) => { @@ -1041,8 +1043,15 @@ export function reviewFile({ commit, state }, { file, reviewed = true }) { export const disableVirtualScroller = ({ commit }) => commit(types.DISABLE_VIRTUAL_SCROLLING); -export const toggleFileCommentForm = ({ commit }, filePath) => - commit(types.TOGGLE_FILE_COMMENT_FORM, filePath); +export const toggleFileCommentForm = ({ state, commit }, filePath) => { + const file = findDiffFile(state.diffFiles, filePath, 'file_path'); + if (isCollapsed(file)) { + commit(types.SET_FILE_COMMENT_FORM, { filePath, expanded: true }); + } else { + commit(types.TOGGLE_FILE_COMMENT_FORM, filePath); + } + commit(types.SET_FILE_COLLAPSED, { filePath, collapsed: false }); +}; export const addDraftToFile = ({ commit }, { filePath, draft }) => commit(types.ADD_DRAFT_TO_FILE, { filePath, draft }); diff --git a/app/assets/javascripts/diffs/store/mutation_types.js b/app/assets/javascripts/diffs/store/mutation_types.js index c2177bacbcc..b155804c70c 100644 --- a/app/assets/javascripts/diffs/store/mutation_types.js +++ b/app/assets/javascripts/diffs/store/mutation_types.js @@ -53,4 +53,5 @@ export const TOGGLE_LINE_DISCUSSIONS = 'TOGGLE_LINE_DISCUSSIONS'; export const DISABLE_VIRTUAL_SCROLLING = 'DISABLE_VIRTUAL_SCROLLING'; export const TOGGLE_FILE_COMMENT_FORM = 'TOGGLE_FILE_COMMENT_FORM'; +export const SET_FILE_COMMENT_FORM = 'SET_FILE_COMMENT_FORM'; export const ADD_DRAFT_TO_FILE = 'ADD_DRAFT_TO_FILE'; diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 08c195469e3..bc5ed3c40df 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -394,6 +394,11 @@ export default { file.hasCommentForm = !file.hasCommentForm; }, + [types.SET_FILE_COMMENT_FORM](state, { filePath, expanded }) { + const file = findDiffFile(state.diffFiles, filePath, 'file_path'); + + file.hasCommentForm = expanded; + }, [types.ADD_DRAFT_TO_FILE](state, { filePath, draft }) { const file = findDiffFile(state.diffFiles, filePath, 'file_path'); diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue index 87021db739a..27646df506b 100644 --- a/app/assets/javascripts/issues/show/components/app.vue +++ b/app/assets/javascripts/issues/show/components/app.vue @@ -562,7 +562,7 @@ export default {
-
+
@@ -410,7 +410,7 @@ export default { id="new-actions-header-dropdown" ref="issuableActionsDropdownDesktop" v-gl-tooltip.hover - class="gl-display-none gl-sm-display-inline-flex!" + class="gl-display-none gl-md-display-inline-flex!" icon="ellipsis_v" category="tertiary" placement="left" diff --git a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue index 2909a4d2666..c84fba23837 100644 --- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue +++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue @@ -133,8 +133,7 @@ export default { item.classList.toggle('gl-display-none', !isSummaryTab); }); - editButton?.classList.toggle('gl-display-none', !isSummaryTab); - editButton?.classList.toggle('gl-sm-display-inline-flex!', isSummaryTab); + editButton?.classList.toggle('gl-md-display-block!', isSummaryTab); } }, }, diff --git a/app/assets/javascripts/issues/show/components/title.vue b/app/assets/javascripts/issues/show/components/title.vue index 375180446d9..fef08ca22cf 100644 --- a/app/assets/javascripts/issues/show/components/title.vue +++ b/app/assets/javascripts/issues/show/components/title.vue @@ -54,7 +54,7 @@ export default {