From effc12bf9dac4bf1e48f1397c25e0381ac1bd76f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 13 Jun 2023 15:10:17 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- ...Geo Replicate a new Git repository type.md | 1 - .../Geo Replicate a new blob type.md | 2 +- Gemfile.checksum | 12 +- Gemfile.lock | 4 +- .../stores/modules/batch_comments/actions.js | 7 +- .../strategies/gitlab_user_list.vue | 54 ++--- .../super_sidebar/components/brand_logo.vue | 7 +- .../vue_shared/components/actions_button.vue | 116 +++------ .../vue_shared/components/web_ide_link.vue | 55 +---- .../_account_and_limit.html.haml | 8 +- .../_diff_limits.html.haml | 2 +- .../application_settings/_pages.html.haml | 2 +- ...etting_registration_features_cta.html.haml | 2 +- .../shared/_choose_avatar_button.html.haml | 2 +- ...etting_registration_features_cta.html.haml | 2 +- ...5152832_API__Ml__AiAssist_authenticate.yml | 22 ++ .../environment_settings_to_graphql.yml | 2 +- ...07_add_vacuum_type_to_autovacuum_status.rb | 47 ++++ db/schema_migrations/20230612072807 | 1 + db/structure.sql | 11 +- doc/administration/auth/atlassian.md | 2 +- doc/administration/auth/cognito.md | 2 +- doc/administration/auth/crowd.md | 2 +- doc/administration/auth/jwt.md | 2 +- .../auth/ldap/google_secure_ldap.md | 2 +- .../auth/ldap/ldap-troubleshooting.md | 2 +- doc/administration/auth/oidc.md | 8 +- doc/administration/auth/smartcard.md | 8 +- doc/administration/cicd.md | 2 +- doc/administration/clusters/kas.md | 6 +- doc/administration/consul.md | 2 +- .../geo/disaster_recovery/index.md | 8 +- .../runbooks/planned_failover_multi_node.md | 2 +- .../geo/replication/disable_geo.md | 2 +- .../geo/replication/multiple_servers.md | 6 +- .../geo/setup/external_database.md | 4 +- doc/administration/geo/setup/index.md | 2 +- doc/administration/gitaly/configure_gitaly.md | 16 +- doc/administration/gitaly/praefect.md | 26 +- doc/administration/gitaly/troubleshooting.md | 4 +- doc/administration/merge_request_diffs.md | 8 +- doc/administration/monitoring/ip_allowlist.md | 2 +- .../monitoring/prometheus/gitlab_exporter.md | 4 +- .../monitoring/prometheus/gitlab_metrics.md | 2 +- .../monitoring/prometheus/index.md | 10 +- .../monitoring/prometheus/node_exporter.md | 2 +- .../prometheus/pgbouncer_exporter.md | 2 +- .../prometheus/postgres_exporter.md | 4 +- .../monitoring/prometheus/redis_exporter.md | 2 +- .../prometheus/registry_exporter.md | 2 +- .../monitoring/prometheus/web_exporter.md | 4 +- doc/administration/object_storage.md | 19 +- doc/administration/operations/puma.md | 2 +- .../packages/container_registry.md | 36 +-- .../packages/dependency_proxy.md | 8 +- doc/administration/pages/index.md | 46 ++-- doc/administration/pages/troubleshooting.md | 6 +- .../postgresql/database_load_balancing.md | 4 +- .../postgresql/replication_and_failover.md | 18 +- doc/administration/postgresql/standalone.md | 2 +- .../redis/replication_and_failover.md | 16 +- doc/administration/redis/standalone.md | 4 +- .../reference_architectures/10k_users.md | 34 +-- .../reference_architectures/25k_users.md | 34 +-- .../reference_architectures/2k_users.md | 12 +- .../reference_architectures/3k_users.md | 28 +-- .../reference_architectures/50k_users.md | 34 +-- .../reference_architectures/5k_users.md | 28 +-- doc/administration/repository_checks.md | 8 +- .../repository_storage_paths.md | 30 +-- .../repository_storage_types.md | 11 +- doc/administration/restart_gitlab.md | 23 +- doc/administration/sidekiq/index.md | 2 +- .../sidekiq/sidekiq_job_migration.md | 2 +- doc/administration/smime_signing_email.md | 2 +- doc/administration/terraform_state.md | 6 +- .../troubleshooting/postgresql.md | 4 +- doc/administration/uploads.md | 4 +- doc/administration/user_settings.md | 4 +- doc/api/integrations.md | 2 + doc/api/rest/index.md | 2 +- doc/ci/runners/saas/linux_saas_runner.md | 4 +- doc/development/contributing/index.md | 5 +- .../deprecation_guidelines/index.md | 51 +--- doc/development/documentation/contribute.md | 4 +- doc/integration/alicloud.md | 4 +- doc/integration/auth0.md | 10 +- doc/integration/azure.md | 6 +- doc/integration/bitbucket.md | 6 +- doc/integration/ding_talk.md | 6 +- doc/integration/facebook.md | 4 +- doc/integration/github.md | 8 +- doc/integration/gitlab.md | 7 +- doc/integration/gitpod.md | 14 +- doc/integration/google.md | 4 +- .../img/gitpod_button_project_page_v13_4.png | Bin 25773 -> 0 bytes doc/integration/kerberos.md | 8 +- doc/integration/salesforce.md | 4 +- doc/integration/shibboleth.md | 4 +- doc/integration/twitter.md | 7 +- doc/raketasks/backup_gitlab.md | 14 +- doc/raketasks/backup_restore.md | 2 +- ...hardening_configuration_recommendations.md | 2 +- doc/topics/autodevops/cicd_variables.md | 4 +- .../cloud_deployments/auto_devops_with_ecs.md | 4 +- .../cloud_deployments/auto_devops_with_eks.md | 7 +- .../cloud_deployments/auto_devops_with_gke.md | 7 +- doc/topics/autodevops/index.md | 17 +- doc/topics/autodevops/requirements.md | 4 +- doc/topics/git/lfs/index.md | 4 +- doc/tutorials/dependency_scanning.md | 4 +- doc/update/terminology.md | 47 ++++ .../account/two_factor_authentication.md | 9 +- .../project/issues/confidential_issues.md | 53 ++-- doc/user/project/issues/create_issues.md | 2 +- .../img/confidential_issues_create_v15_4.png | Bin 13023 -> 0 bytes .../img/turn_off_confidentiality_v15_1.png | Bin 20524 -> 0 bytes .../img/turn_on_confidentiality_v15_1.png | Bin 16370 -> 0 bytes doc/user/project/repository/web_editor.md | 8 +- doc/user/project/service_desk.md | 2 +- doc/user/project/web_ide/index.md | 8 +- .../database/postgres_autovacuum_activity.rb | 7 +- locale/gitlab.pot | 36 +-- qa/qa/page/file/show.rb | 12 +- qa/qa/page/project/show.rb | 10 +- spec/features/admin/admin_settings_spec.rb | 6 +- spec/features/projects/blobs/edit_spec.rb | 6 +- .../user_views_pipeline_editor_button_spec.rb | 7 + .../files/user_browses_lfs_files_spec.rb | 4 +- .../projects/files/user_creates_files_spec.rb | 4 +- .../projects/files/user_edits_files_spec.rb | 32 +-- .../user_sees_collaboration_links_spec.rb | 7 +- .../modules/batch_comments/actions_spec.js | 13 + .../strategies/gitlab_user_list_spec.js | 26 +- .../components/actions_button_spec.js | 227 +++++------------- .../components/web_ide_link_spec.js | 145 +---------- .../postgres_autovacuum_activity_spec.rb | 10 + .../helpers/features/blob_spec_helpers.rb | 10 +- .../helpers/features/web_ide_spec_helpers.rb | 7 +- 139 files changed, 808 insertions(+), 1055 deletions(-) create mode 100644 config/events/20230605152832_API__Ml__AiAssist_authenticate.yml create mode 100644 db/migrate/20230612072807_add_vacuum_type_to_autovacuum_status.rb create mode 100644 db/schema_migrations/20230612072807 delete mode 100644 doc/integration/img/gitpod_button_project_page_v13_4.png create mode 100644 doc/update/terminology.md delete mode 100644 doc/user/project/issues/img/confidential_issues_create_v15_4.png delete mode 100644 doc/user/project/issues/img/turn_off_confidentiality_v15_1.png delete mode 100644 doc/user/project/issues/img/turn_on_confidentiality_v15_1.png diff --git a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md index 88c82688273..e11cef5ae9b 100644 --- a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md +++ b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md @@ -567,7 +567,6 @@ That's all of the required database changes. end ``` -- [ ] Add `[:geo_cool_widget_state, any]` to `skipped` in `spec/models/factories_spec.rb` #### Step 2. Implement metrics gathering diff --git a/.gitlab/issue_templates/Geo Replicate a new blob type.md b/.gitlab/issue_templates/Geo Replicate a new blob type.md index edef88cb022..91a86a96ac9 100644 --- a/.gitlab/issue_templates/Geo Replicate a new blob type.md +++ b/.gitlab/issue_templates/Geo Replicate a new blob type.md @@ -534,7 +534,7 @@ That's all of the required database changes. end ``` -- [ ] Add `[:cool_widget, :remote_store]` and `[:geo_cool_widget_state, any]` to `skipped` in `spec/models/factories_spec.rb` +- [ ] Add `[:cool_widget, :remote_store]` to `skipped` in `spec/models/factories_spec.rb` #### Step 2. Implement metrics gathering diff --git a/Gemfile.checksum b/Gemfile.checksum index e92636383ad..54ae081e342 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -453,11 +453,11 @@ {"name":"premailer","version":"1.16.0","platform":"ruby","checksum":"03e4402c448e6bae13fb5f6301a8bde4f3508e1bff90ae7c0972c7be94694786"}, {"name":"premailer-rails","version":"1.10.3","platform":"ruby","checksum":"7cdcb97027866f7a81c490c6d15ada7f39666b5f6375f0821b7e97e0483b112f"}, {"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"}, -{"name":"prometheus-client-mmap","version":"0.24.3","platform":"aarch64-linux","checksum":"e9e05922724a1caa2788dd32567ec9e3e95607fb32f8eb95bb95884061a3042e"}, -{"name":"prometheus-client-mmap","version":"0.24.3","platform":"arm64-darwin","checksum":"6b618db676f7286de80c1ffdc52d931fc474e470c34d652e38d74b46953955b8"}, -{"name":"prometheus-client-mmap","version":"0.24.3","platform":"ruby","checksum":"014542ebeb7b9187427c0d431fe5bcab9b07d293a25e61182a92e79cc95dde34"}, -{"name":"prometheus-client-mmap","version":"0.24.3","platform":"x86_64-darwin","checksum":"4fde644acbd01e149edda9c47746dca0dc9610951fc793a22989a069670cfe5c"}, -{"name":"prometheus-client-mmap","version":"0.24.3","platform":"x86_64-linux","checksum":"981dbaadfccb8652feac7fce7a129464274140dbb7603f5e5060b8536387eaa1"}, +{"name":"prometheus-client-mmap","version":"0.24.4","platform":"aarch64-linux","checksum":"c23da204864167d6f43e8a1e925702ddfeb802cfaaa7b240ec4ee7996c97de92"}, +{"name":"prometheus-client-mmap","version":"0.24.4","platform":"arm64-darwin","checksum":"d18e9a2f4ff960c8ab833ba8f4c2581f106346b81452b3bd02ba8d5637c11d71"}, +{"name":"prometheus-client-mmap","version":"0.24.4","platform":"ruby","checksum":"8a0da7f4e5ff3e27e0df0223ce5e5945b60cf78fcf015f772b89f69b72b7b0a0"}, +{"name":"prometheus-client-mmap","version":"0.24.4","platform":"x86_64-darwin","checksum":"065f890b08b07d60080df7803f9a78c6362a3e0fc78f0de38be77856ff721d19"}, +{"name":"prometheus-client-mmap","version":"0.24.4","platform":"x86_64-linux","checksum":"645b59fa89a2f8433beea4a5316516aa117406674454040efad8c608b1d09944"}, {"name":"pry","version":"0.14.2","platform":"java","checksum":"fd780670977ba04ff7ee32dabd4d02fe4bf02e977afe8809832d5dca1412862e"}, {"name":"pry","version":"0.14.2","platform":"ruby","checksum":"c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d"}, {"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"}, @@ -489,7 +489,7 @@ {"name":"rake","version":"13.0.6","platform":"ruby","checksum":"5ce4bf5037b4196c24ac62834d8db1ce175470391026bd9e557d669beeb19097"}, {"name":"rb-fsevent","version":"0.11.2","platform":"ruby","checksum":"43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe"}, {"name":"rb-inotify","version":"0.10.1","platform":"ruby","checksum":"050062d4f31d307cca52c3f6a7f4b946df8de25fc4bd373e1a5142e41034a7ca"}, -{"name":"rb_sys","version":"0.9.75","platform":"ruby","checksum":"435427cf071c40a684b4be20f14bb7e64e122e75b131f24101fa897c8ed9a8ff"}, +{"name":"rb_sys","version":"0.9.78","platform":"ruby","checksum":"635275db76f8885443dbd4ce8dd9b011ea27cb35dfa67ad1f268aba4f4fe7a26"}, {"name":"rbtrace","version":"0.4.14","platform":"ruby","checksum":"162bbf89cecabfc4f09c869b655f6f3a679c4870ebb7cbdcadf7393a81cc1769"}, {"name":"rbtree","version":"0.4.6","platform":"ruby","checksum":"14eea4469b24fd2472542e5f3eb105d6344c8ccf36f0b56d55fdcfeb4e0f10fc"}, {"name":"rchardet","version":"1.8.0","platform":"ruby","checksum":"693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7"}, diff --git a/Gemfile.lock b/Gemfile.lock index 307b36322a2..67bb1a3c8bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1153,7 +1153,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.24.3) + prometheus-client-mmap (0.24.4) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1231,7 +1231,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.75) + rb_sys (0.9.78) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js index 4888cbe3dfe..45e7256a734 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js @@ -24,12 +24,17 @@ export const addDraftToDiscussion = ({ commit }, { endpoint, data }) => }); }); -export const createNewDraft = ({ commit }, { endpoint, data }) => +export const createNewDraft = ({ commit, dispatch }, { endpoint, data }) => service .createNewDraft(endpoint, data) .then((res) => res.data) .then((res) => { commit(types.ADD_NEW_DRAFT, res); + + if (res.position?.position_type === FILE_DIFF_POSITION_TYPE) { + dispatch('diffs/addDraftToFile', { filePath: res.file_path, draft: res }, { root: true }); + } + return res; }) .catch(() => { diff --git a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue index 9dbffe75f6b..53745d3b021 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue @@ -1,5 +1,5 @@ @@ -67,26 +65,16 @@ export default { :description="hasUserLists ? $options.translations.rolloutUserListDescription : ''" > diff --git a/app/assets/javascripts/super_sidebar/components/brand_logo.vue b/app/assets/javascripts/super_sidebar/components/brand_logo.vue index 4a2443e6b44..c017fa8afa2 100644 --- a/app/assets/javascripts/super_sidebar/components/brand_logo.vue +++ b/app/assets/javascripts/super_sidebar/components/brand_logo.vue @@ -34,7 +34,12 @@ export default { data-track-label="gitlab_logo_link" data-track-property="nav_core_menu" > - + diff --git a/app/assets/javascripts/vue_shared/components/actions_button.vue b/app/assets/javascripts/vue_shared/components/actions_button.vue index 175aef59ae5..c3f3226c46e 100644 --- a/app/assets/javascripts/vue_shared/components/actions_button.vue +++ b/app/assets/javascripts/vue_shared/components/actions_button.vue @@ -1,29 +1,25 @@ diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue index 3c08142e2b9..96944877f61 100644 --- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue +++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue @@ -3,9 +3,7 @@ import { GlModal, GlSprintf, GlLink } from '@gitlab/ui'; import { s__, __ } from '~/locale'; import { visitUrl } from '~/lib/utils/url_utility'; import ActionsButton from '~/vue_shared/components/actions_button.vue'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import ConfirmForkModal from '~/vue_shared/components/confirm_fork_modal.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { KEY_EDIT, KEY_WEB_IDE, KEY_GITPOD, KEY_PIPELINE_EDITOR } from './constants'; export const i18n = { @@ -21,22 +19,18 @@ export const i18n = { webIdeTooltip: s__( 'WebIDE|Quickly and easily edit multiple files in your project. Press . to open', ), + toggleText: __('Edit'), }; -export const PREFERRED_EDITOR_KEY = 'gl-web-ide-button-selected'; -export const PREFERRED_EDITOR_RESET_KEY = 'gl-web-ide-button-selected-reset'; - export default { components: { ActionsButton, - LocalStorageSync, GlModal, GlSprintf, GlLink, ConfirmForkModal, }, i18n, - mixins: [glFeatureFlagsMixin()], props: { isFork: { type: Boolean, @@ -141,7 +135,6 @@ export default { }, data() { return { - selection: this.showPipelineEditorButton ? KEY_PIPELINE_EDITOR : KEY_WEB_IDE, showEnableGitpodModal: false, showForkModal: false, }; @@ -155,6 +148,9 @@ export default { this.gitpodAction, ].filter((action) => action); }, + hasActions() { + return this.actions.length > 0; + }, editAction() { if (!this.showEditButton) { return null; @@ -176,9 +172,8 @@ export default { return { key: KEY_EDIT, - text: __('Edit'), + text: __('Edit single file'), secondaryText: __('Edit this file only.'), - tooltip: '', attrs: { 'data-qa-selector': 'edit_button', 'data-track-action': 'click_consolidated_edit', @@ -205,7 +200,6 @@ export default { const handleOptions = this.needsToFork ? { - href: '#modal-confirm-fork-webide', handle: () => { if (this.disableForkModal) { this.$emit('edit', 'ide'); @@ -216,9 +210,7 @@ export default { }, } : { - href: this.webIdeUrl, - handle: (evt) => { - evt.preventDefault(); + handle: () => { visitUrl(this.webIdeUrl, true); }, }; @@ -227,7 +219,6 @@ export default { key: KEY_WEB_IDE, text: this.webIdeActionText, secondaryText: this.$options.i18n.webIdeText, - tooltip: this.$options.i18n.webIdeTooltip, attrs: { 'data-qa-selector': 'web_ide_button', 'data-track-action': 'click_consolidated_edit_ide', @@ -258,7 +249,6 @@ export default { key: KEY_PIPELINE_EDITOR, text: __('Edit in pipeline editor'), secondaryText, - tooltip: secondaryText, attrs: { 'data-qa-selector': 'pipeline_editor_button', }, @@ -283,7 +273,6 @@ export default { key: KEY_GITPOD, text: this.gitpodActionText, secondaryText, - tooltip: secondaryText, attrs: { 'data-qa-selector': 'gitpod_button', }, @@ -310,52 +299,24 @@ export default { }; }, }, - mounted() { - this.resetPreferredEditor(); - }, methods: { - select(key) { - this.selection = key; - }, showModal(dataKey) { this[dataKey] = true; }, - resetPreferredEditor() { - if (!this.glFeatures.vscodeWebIde || this.showEditButton) { - return; - } - - if (localStorage.getItem(PREFERRED_EDITOR_RESET_KEY) === 'true') { - return; - } - - localStorage.setItem(PREFERRED_EDITOR_KEY, KEY_WEB_IDE); - localStorage.setItem(PREFERRED_EDITOR_RESET_KEY, true); - - this.select(KEY_WEB_IDE); - }, }, webIdeButtonId: 'web-ide-link', - PREFERRED_EDITOR_KEY, };