From 1f5e09ed6082d079dfebef92f69630c10f78c844 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Apr 2023 18:08:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rules.gitlab-ci.yml | 2 +- .rubocop_todo/layout/argument_alignment.yml | 13 - app/assets/javascripts/lib/mermaid.js | 5 +- .../notes/components/discussion_counter.vue | 2 +- .../components/performance_bar_app.vue | 23 +- .../states/unresolved_discussions.vue | 2 +- app/assets/stylesheets/framework/mixins.scss | 12 - .../projects/settings/ci_cd_controller.rb | 2 +- app/mailers/emails/profile.rb | 13 + app/models/ci/runner.rb | 4 +- app/models/project.rb | 2 +- app/policies/project_snippet_policy.rb | 10 +- app/services/achievements/award_service.rb | 1 + app/services/notification_service.rb | 4 + .../notify/new_achievement_email.html.haml | 7 + .../notify/new_achievement_email.text.erb | 4 + .../issuable/form/_merge_params.html.haml | 29 +- ...multiple_environment_approval_rules_fe.yml | 8 - ...space_index_to_storage_limit_exclusions.rb | 25 ++ ...backfill_is_finished_for_gitlab_dot_com.rb | 29 ++ ...ns_note_id_to_bigint_for_gitlab_dot_com.rb | 60 ++++ db/schema_migrations/20230404023648 | 1 + db/schema_migrations/20230404023915 | 1 + db/schema_migrations/20230405102815 | 1 + db/structure.sql | 8 +- doc/administration/dedicated/index.md | 2 +- .../contributing/first_contribution.md | 340 ++++++++++++++++++ .../contributing/img/bot_ready.png | Bin 0 -> 9367 bytes .../contributing/img/changes_tab.png | Bin 0 -> 49899 bytes doc/development/contributing/img/gdk_home.png | Bin 0 -> 56874 bytes .../contributing/img/mr_button.png | Bin 0 -> 14900 bytes .../contributing/img/new_merge_request.png | Bin 0 -> 9302 bytes .../contributing/img/ui_text_after.png | Bin 0 -> 4446 bytes .../contributing/img/ui_text_before.png | Bin 0 -> 5243 bytes .../documentation/site_architecture/index.md | 2 +- .../documentation/styleguide/word_list.md | 34 +- .../documentation/topic_types/index.md | 53 +-- doc/development/testing_guide/flaky_tests.md | 2 +- doc/tutorials/fuzz_testing_tutorial.md | 243 +++++++++++++ doc/user/discussions/index.md | 2 +- doc/user/group/saml_sso/index.md | 18 +- doc/user/group/saml_sso/scim_setup.md | 4 +- doc/user/group/saml_sso/troubleshooting.md | 2 +- doc/user/profile/achievements.md | 1 + lib/backup/manager.rb | 8 +- .../Terraform/Base.latest.gitlab-ci.yml | 3 + lib/tasks/gitlab/gitaly.rake | 2 +- locale/gitlab.pot | 36 +- qa/qa/page/project/import/github.rb | 20 +- .../resource/project_imported_from_github.rb | 4 +- ...e_for_discussions_in_merge_request_spec.rb | 10 +- .../mr_widget_unresolved_discussions_spec.js | 4 +- spec/lib/backup/manager_spec.rb | 8 +- spec/mailers/emails/profile_spec.rb | 29 +- ...ill_is_finished_for_gitlab_dot_com_spec.rb | 35 ++ ...te_id_to_bigint_for_gitlab_dot_com_spec.rb | 66 ++++ spec/models/ci/runner_spec.rb | 8 +- spec/policies/ci/build_policy_spec.rb | 30 +- spec/policies/ci/pipeline_policy_spec.rb | 18 +- .../ci/pipeline_schedule_policy_spec.rb | 12 +- spec/policies/environment_policy_spec.rb | 3 +- spec/policies/group_policy_spec.rb | 5 +- .../achievements/award_service_spec.rb | 9 +- spec/tasks/gitlab/gitaly_rake_spec.rb | 8 +- .../new_achievement_email.html.haml_spec.rb | 26 ++ 65 files changed, 1113 insertions(+), 202 deletions(-) create mode 100644 app/views/notify/new_achievement_email.html.haml create mode 100644 app/views/notify/new_achievement_email.text.erb delete mode 100644 config/feature_flags/development/multiple_environment_approval_rules_fe.yml create mode 100644 db/migrate/20230405102815_add_unique_namespace_index_to_storage_limit_exclusions.rb create mode 100644 db/post_migrate/20230404023648_ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com.rb create mode 100644 db/post_migrate/20230404023915_swap_suggestions_note_id_to_bigint_for_gitlab_dot_com.rb create mode 100644 db/schema_migrations/20230404023648 create mode 100644 db/schema_migrations/20230404023915 create mode 100644 db/schema_migrations/20230405102815 create mode 100644 doc/development/contributing/first_contribution.md create mode 100644 doc/development/contributing/img/bot_ready.png create mode 100644 doc/development/contributing/img/changes_tab.png create mode 100644 doc/development/contributing/img/gdk_home.png create mode 100644 doc/development/contributing/img/mr_button.png create mode 100644 doc/development/contributing/img/new_merge_request.png create mode 100644 doc/development/contributing/img/ui_text_after.png create mode 100644 doc/development/contributing/img/ui_text_before.png create mode 100644 doc/tutorials/fuzz_testing_tutorial.md create mode 100644 spec/migrations/ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com_spec.rb create mode 100644 spec/migrations/swap_suggestions_note_id_to_bigint_for_gitlab_dot_com_spec.rb create mode 100644 spec/views/notify/new_achievement_email.html.haml_spec.rb diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 03af9990722..45f14dc0033 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1128,7 +1128,7 @@ - <<: *if-not-canonical-namespace when: never - <<: *if-merge-request-targeting-stable-branch - when: on_failure + when: always ############### # Pages rules # diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index be389f5bb36..bfe30034c7c 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -583,7 +583,6 @@ Layout/ArgumentAlignment: - 'app/models/webauthn_registration.rb' - 'app/models/wiki_page.rb' - 'app/models/work_item.rb' - - 'app/policies/project_snippet_policy.rb' - 'app/services/ci/archive_trace_service.rb' - 'app/services/ci/ensure_stage_service.rb' - 'app/services/ci/list_config_variables_service.rb' @@ -1448,13 +1447,6 @@ Layout/ArgumentAlignment: - 'ee/spec/models/upload_spec.rb' - 'ee/spec/models/vulnerabilities/finding_spec.rb' - 'ee/spec/models/vulnerabilities/state_transition_spec.rb' - - 'ee/spec/policies/dast/pre_scan_verification_policy_spec.rb' - - 'ee/spec/policies/dast/pre_scan_verification_step_policy_spec.rb' - - 'ee/spec/policies/deployment_policy_spec.rb' - - 'ee/spec/policies/epic_policy_spec.rb' - - 'ee/spec/policies/merge_request_policy_spec.rb' - - 'ee/spec/policies/vulnerabilities/feedback_policy_spec.rb' - - 'ee/spec/policies/vulnerabilities/merge_request_link_policy_spec.rb' - 'ee/spec/requests/admin/impersonation_tokens_controller_spec.rb' - 'ee/spec/requests/api/analytics/product_analytics_spec.rb' - 'ee/spec/requests/api/analytics/project_deployment_frequency_spec.rb' @@ -2443,11 +2435,6 @@ Layout/ArgumentAlignment: - 'spec/models/user_detail_spec.rb' - 'spec/models/user_spec.rb' - 'spec/models/wiki_page/meta_spec.rb' - - 'spec/policies/ci/build_policy_spec.rb' - - 'spec/policies/ci/pipeline_policy_spec.rb' - - 'spec/policies/ci/pipeline_schedule_policy_spec.rb' - - 'spec/policies/environment_policy_spec.rb' - - 'spec/policies/group_policy_spec.rb' - 'spec/requests/admin/applications_controller_spec.rb' - 'spec/requests/admin/impersonation_tokens_controller_spec.rb' - 'spec/requests/api/access_requests_spec.rb' diff --git a/app/assets/javascripts/lib/mermaid.js b/app/assets/javascripts/lib/mermaid.js index c72561ce69d..60b46989375 100644 --- a/app/assets/javascripts/lib/mermaid.js +++ b/app/assets/javascripts/lib/mermaid.js @@ -12,8 +12,9 @@ const drawDiagram = (source) => { // eslint-disable-next-line no-unsanitized/property element.innerHTML = svgCode; - const height = parseInt(element.firstElementChild.getAttribute('height'), 10); - const width = parseInt(element.firstElementChild.style.maxWidth, 10); + element.firstElementChild.removeAttribute('height'); + const { height, width } = element.firstElementChild.getBoundingClientRect(); + setIframeRenderedSize(height, width); }; mermaid.mermaidAPI.render('mermaid', source, insertSvg); diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 37935e9c3c6..ba5ffc60917 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -157,7 +157,7 @@ export default { v-if="resolveAllDiscussionsIssuePath && !allResolved" :href="resolveAllDiscussionsIssuePath" > - {{ __('Create issue to resolve all threads') }} + {{ __('Resolve all with new issue') }} diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 2c5f4354d38..4bd86d4982e 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -1,5 +1,5 @@