From bc3187f6d968f954c7998b66a6595273f9ecf5e1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 5 Apr 2022 18:09:00 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/mirrors/ssh_mirror.js | 4 +- .../components/user_popover/user_popover.vue | 2 +- .../projects/artifacts_controller.rb | 6 +- app/helpers/workhorse_helper.rb | 8 + .../projects/build_artifacts_size_refresh.rb | 2 +- .../_security_newsletter_callout.html.haml | 13 +- app/views/admin/groups/_form.html.haml | 2 +- app/views/admin/projects/show.html.haml | 6 +- app/views/admin/runners/edit.html.haml | 5 +- app/views/admin/users/_users.html.haml | 5 +- app/views/clusters/clusters/_banner.html.haml | 12 +- .../_gcp_signup_offer_banner.html.haml | 6 +- ...roup_from_another_instance_panel.html.haml | 5 +- app/views/groups/settings/_export.html.haml | 4 +- .../groups/settings/_remove_button.html.haml | 2 +- app/views/groups/settings/_transfer.html.haml | 2 +- app/views/import/shared/_errors.html.haml | 5 +- app/views/profiles/accounts/show.html.haml | 11 +- .../profiles/two_factor_auths/show.html.haml | 4 +- app/views/projects/_deletion_failed.html.haml | 4 +- app/views/projects/_last_push.html.haml | 5 +- .../projects/_new_project_fields.html.haml | 4 +- app/views/projects/blob/_upload.html.haml | 5 +- app/views/projects/blob/edit.html.haml | 5 +- app/views/projects/branches/new.html.haml | 4 +- app/views/projects/commits/_commits.html.haml | 5 +- app/views/projects/diffs/_warning.html.haml | 5 +- app/views/projects/forks/error.html.haml | 5 +- .../_alert_moved_from_service_desk.html.haml | 6 +- .../projects/mattermosts/_no_teams.html.haml | 6 +- .../merge_requests/_mr_title.html.haml | 5 +- .../projects/merge_requests/invalid.html.haml | 5 +- app/views/projects/milestones/show.html.haml | 6 +- .../projects/mirrors/_mirror_repos.html.haml | 4 +- .../projects/mirrors/_ssh_host_keys.html.haml | 2 +- .../projects/pages_domains/_form.html.haml | 2 +- app/views/projects/services/_form.html.haml | 5 +- ...devops_implicitly_enabled_banner.html.haml | 6 +- app/views/shared/_import_form.html.haml | 5 +- app/views/shared/_no_password.html.haml | 5 +- app/views/shared/_no_ssh.html.haml | 5 +- app/views/shared/_project_limit.html.haml | 5 +- .../shared/_service_ping_consent.html.haml | 4 +- ...tor_auth_recovery_settings_check.html.haml | 9 +- .../errors/_gitaly_unavailable.html.haml | 5 +- app/views/shared/hook_logs/_content.html.haml | 5 +- app/views/shared/issuable/_form.html.haml | 5 +- .../issuable/_label_page_create.html.haml | 2 +- .../_milestone_complete_alert.html.haml | 5 +- .../runners/_runner_type_alert.html.haml | 10 +- .../shared/web_hooks/_hook_errors.html.haml | 18 +- app/workers/bulk_imports/pipeline_worker.rb | 7 +- .../ci_safe_artifact_content_type.yml | 8 + doc/user/project/settings/import_export.md | 3 +- lib/api/ci/job_artifacts.rb | 12 +- lib/api/helpers.rb | 8 + lib/gitlab/database/migration_helpers.rb | 2 +- lib/gitlab/workhorse.rb | 7 + lib/tasks/gitlab/background_migrations.rake | 4 +- package.json | 2 +- .../projects/artifacts_controller_spec.rb | 13 + .../gitlab/database/migration_helpers_spec.rb | 4 +- spec/lib/gitlab/workhorse_spec.rb | 8 + .../build_artifacts_size_refresh_spec.rb | 6 +- spec/requests/api/ci/job_artifacts_spec.rb | 21 +- .../gitlab/background_migrations_rake_spec.rb | 11 + yarn.lock | 398 ++++++++---------- 67 files changed, 392 insertions(+), 398 deletions(-) create mode 100644 config/feature_flags/development/ci_safe_artifact_content_type.yml diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js index 5138c450feb..e375435436e 100644 --- a/app/assets/javascripts/mirrors/ssh_mirror.js +++ b/app/assets/javascripts/mirrors/ssh_mirror.js @@ -76,7 +76,7 @@ export default class SSHMirror { // Disable button while we make request this.$btnDetectHostKeys.disable(); - $btnLoadSpinner.removeClass('d-none'); + $btnLoadSpinner.removeClass('gl-display-none'); // Make backOff polling to get data backOff((next, stop) => { @@ -101,7 +101,7 @@ export default class SSHMirror { .catch(stop); }) .then((res) => { - $btnLoadSpinner.addClass('d-none'); + $btnLoadSpinner.addClass('gl-display-none'); // Once data is received, we show verification info along with Host keys and fingerprints this.$hostKeysInformation .find('.js-fingerprint-verification') diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index 41507ca94e2..6f2182d494f 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -69,7 +69,7 @@ export default {
- +