diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-12 06:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-12 06:08:20 +0300 |
commit | febca4e859a04ac71b1d9950de272c35875424d3 (patch) | |
tree | cabcf6ea0847a5cddbcff39880dbc0314aa47887 | |
parent | e57da6ba898df025f93bf8d3a896c7c2ba2ab830 (diff) |
Add latest changes from gitlab-org/gitlab@master
22 files changed, 58 insertions, 31 deletions
diff --git a/app/assets/javascripts/admin/deploy_keys/components/table.vue b/app/assets/javascripts/admin/deploy_keys/components/table.vue index ac963a12afb..6610a0caec5 100644 --- a/app/assets/javascripts/admin/deploy_keys/components/table.vue +++ b/app/assets/javascripts/admin/deploy_keys/components/table.vue @@ -277,6 +277,7 @@ export default { <gl-empty-state v-else :svg-path="emptyStateSvgPath" + :svg-height="150" :title="$options.i18n.emptyStateTitle" :description="$options.i18n.emptyStateDescription" /> diff --git a/app/helpers/admin/deploy_key_helper.rb b/app/helpers/admin/deploy_key_helper.rb index caf3757a68e..8b23c3e1e13 100644 --- a/app/helpers/admin/deploy_key_helper.rb +++ b/app/helpers/admin/deploy_key_helper.rb @@ -7,7 +7,7 @@ module Admin edit_path: edit_admin_deploy_key_path(':id'), delete_path: admin_deploy_key_path(':id'), create_path: new_admin_deploy_key_path, - empty_state_svg_path: image_path('illustrations/empty-state/empty-deploy-keys-lg.svg') + empty_state_svg_path: image_path('illustrations/empty-state/empty-access-token-md.svg') } end end diff --git a/app/helpers/projects/cluster_agents_helper.rb b/app/helpers/projects/cluster_agents_helper.rb index f62f5eadfb4..d285cfa03c2 100644 --- a/app/helpers/projects/cluster_agents_helper.rb +++ b/app/helpers/projects/cluster_agents_helper.rb @@ -6,7 +6,7 @@ module Projects::ClusterAgentsHelper activity_empty_state_image: image_path('illustrations/empty-state/empty-state-agents.svg'), agent_name: agent_name, can_admin_vulnerability: can?(current_user, :admin_vulnerability, project).to_s, - empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'), + empty_state_svg_path: image_path('illustrations/empty-state/empty-radar-md.svg'), project_path: project.full_path, kas_address: Gitlab::Kas.external_url, kas_version: Gitlab::Kas.version_info, diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index 8df6bfdd697..010f15ec6f2 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -44,7 +44,8 @@ - if commits.size == 0 && context_commits.nil? .commits-empty.gl-mt-6 - = custom_icon('illustration_no_commits') + .svg-content.svg-150 + = image_tag('illustrations/empty-state/empty-search-md.svg') %h4 = _('Your search didn\'t match any commits.') %p diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml index 5760841db88..92b3df6f1c4 100644 --- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml +++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml @@ -16,6 +16,7 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "12.9" introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441" diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml index 098e30ee827..d932ab8a4a6 100644 --- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml +++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml index 6ca92203a03..5581c0a3e08 100644 --- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml +++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml index 84a039c330e..5b28ea0e076 100644 --- a/config/metrics/counts_all/20210204124930_servers.yml +++ b/config/metrics/counts_all/20210204124930_servers.yml @@ -16,4 +16,6 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml index 46178bf1ff6..669deb00227 100644 --- a/config/metrics/counts_all/20210216180654_jira.yml +++ b/config/metrics/counts_all/20210216180654_jira.yml @@ -16,4 +16,6 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml index c0b572ba851..b4ca69f057b 100644 --- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml +++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml index ed1b0c2532c..6408ee68a70 100644 --- a/config/metrics/counts_all/20210216181115_issues.yml +++ b/config/metrics/counts_all/20210216181115_issues.yml @@ -17,4 +17,6 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml index 87a8278c9aa..acbc0f132b4 100644 --- a/config/metrics/counts_all/20210216181134_epics.yml +++ b/config/metrics/counts_all/20210216181134_epics.yml @@ -14,4 +14,6 @@ distribution: tier: - premium - ultimate +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml index 8f4763dcf55..41ed85f7881 100644 --- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml +++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml @@ -19,3 +19,5 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml index f04755c7cac..dd9dfb8239b 100644 --- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml +++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml @@ -19,3 +19,5 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml index c3524a57e56..bb9ed069cc8 100644 --- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml +++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml @@ -19,3 +19,5 @@ tier: - free - premium - ultimate +performance_indicator_type: +- customer_health_score diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml index 8c7bfeb5903..61bd52e1ce6 100644 --- a/config/metrics/license/20210204124928_version.yml +++ b/config/metrics/license/20210204124928_version.yml @@ -17,4 +17,5 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml index dbbd2b74970..b9f175be23a 100644 --- a/config/metrics/settings/20210204124912_prometheus_enabled.yml +++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml index 197ea408f73..7dd5fefa142 100644 --- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml +++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml @@ -16,5 +16,6 @@ tier: - free - premium - ultimate -performance_indicator_type: [] +performance_indicator_type: +- customer_health_score milestone: "<13.9" diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key index fbffebb6086..66781343411 100755 --- a/scripts/decomposition/generate-loose-foreign-key +++ b/scripts/decomposition/generate-loose-foreign-key @@ -164,18 +164,20 @@ def generate_migration(definition) class Remove#{definition.to_table.camelcase}#{definition.from_table.camelcase}#{definition.column.camelcase}Fk < Gitlab::Database::Migration[2.1] disable_ddl_transaction! + FOREIGN_KEY_NAME = "#{definition.name}" + def up - return unless foreign_key_exists?(:#{definition.from_table}, :#{definition.to_table}, name: "#{definition.name}") + return unless foreign_key_exists?(:#{definition.from_table}, :#{definition.to_table}, name: FOREIGN_KEY_NAME) with_lock_retries do remove_foreign_key_if_exists(:#{definition.from_table}, :#{definition.to_table}, - name: "#{definition.name}", reverse_lock_order: true) + name: FOREIGN_KEY_NAME, reverse_lock_order: true) end end def down add_concurrent_foreign_key(:#{definition.from_table}, :#{definition.to_table}, - name: "#{definition.name}", column: :#{definition.column}, + name: FOREIGN_KEY_NAME, column: :#{definition.column}, target_column: :#{definition.primary_key}, on_delete: :#{definition.on_delete}) end end diff --git a/scripts/generate-message-to-run-e2e-pipeline.rb b/scripts/generate-message-to-run-e2e-pipeline.rb index bdb3a12e483..cfe480ac5c7 100755 --- a/scripts/generate-message-to-run-e2e-pipeline.rb +++ b/scripts/generate-message-to-run-e2e-pipeline.rb @@ -70,19 +70,20 @@ class GenerateMessageToRunE2ePipeline def content <<~MARKDOWN <!-- Run e2e warning begin --> - :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR. + @#{author_username} Some end-to-end (E2E) tests should run based on the stage label. - Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure the tests in `follow-up-e2e:package-and-test-ee` pipeline - are passing **before this MR is merged**. - (The E2E test pipeline is computationally intensive and we cannot afford running it automatically for all pushes/rebases. Therefore, this job must be triggered manually after significant changes at least once.) + Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure tests in the `follow-up-e2e:package-and-test-ee` pipeline + pass **before this MR is merged**. + (E2E tests are computationally intensive and don't run automatically for every push/rebase, so we ask you to run this job manually at least once.) - If you would like to run all E2E tests, please apply the ~"pipeline:run-all-e2e" label and trigger a new pipeline. This will run all tests in `e2e:package-and-test` pipeline. + To run all E2E tests, apply the ~"pipeline:run-all-e2e" label and run a new pipeline. - The E2E test jobs are allowed to fail due to [flakiness](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/test-metrics-dashboards/#package-and-test). For the list of known failures please refer to [the latest pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). + E2E test jobs are allowed to fail due to [flakiness](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/test-metrics-dashboards/#package-and-test). + See current failures at the latest [pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). - Once done, please apply the ✅ emoji on this comment. + Once done, apply the ✅ emoji on this comment. - For any questions or help in reviewing the E2E test results, please reach out on the internal #quality Slack channel. + For any questions or help, reach out on the internal #quality Slack channel. <!-- Run e2e warning end --> MARKDOWN end diff --git a/spec/helpers/admin/deploy_key_helper_spec.rb b/spec/helpers/admin/deploy_key_helper_spec.rb index ca951ccf485..0c07ecf90ce 100644 --- a/spec/helpers/admin/deploy_key_helper_spec.rb +++ b/spec/helpers/admin/deploy_key_helper_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Admin::DeployKeyHelper do let_it_be(:edit_path) { '/admin/deploy_keys/:id/edit' } let_it_be(:delete_path) { '/admin/deploy_keys/:id' } let_it_be(:create_path) { '/admin/deploy_keys/new' } - let_it_be(:empty_state_svg_path) { '/assets/illustrations/empty-state/empty-deploy-keys-lg.svg' } + let_it_be(:empty_state_svg_path) { '/assets/illustrations/empty-state/empty-access-token-md.svg' } subject(:result) { helper.admin_deploy_keys_data } @@ -15,7 +15,7 @@ RSpec.describe Admin::DeployKeyHelper do expect(helper).to receive(:edit_admin_deploy_key_path).with(':id').and_return(edit_path) expect(helper).to receive(:admin_deploy_key_path).with(':id').and_return(delete_path) expect(helper).to receive(:new_admin_deploy_key_path).and_return(create_path) - expect(helper).to receive(:image_path).with('illustrations/empty-state/empty-deploy-keys-lg.svg').and_return(empty_state_svg_path) + expect(helper).to receive(:image_path).with('illustrations/empty-state/empty-access-token-md.svg').and_return(empty_state_svg_path) expect(result).to eq({ edit_path: edit_path, diff --git a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb index 2032a986f52..2747e1ec811 100644 --- a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb +++ b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb @@ -222,19 +222,20 @@ RSpec.describe GenerateMessageToRunE2ePipeline, feature_category: :tooling do let(:expected_content) do <<~MARKDOWN <!-- Run e2e warning begin --> - :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR. + @#{author_username} Some end-to-end (E2E) tests should run based on the stage label. - Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure the tests in `follow-up-e2e:package-and-test-ee` pipeline - are passing **before this MR is merged**. - (The E2E test pipeline is computationally intensive and we cannot afford running it automatically for all pushes/rebases. Therefore, this job must be triggered manually after significant changes at least once.) + Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure tests in the `follow-up-e2e:package-and-test-ee` pipeline + pass **before this MR is merged**. + (E2E tests are computationally intensive and don't run automatically for every push/rebase, so we ask you to run this job manually at least once.) - If you would like to run all E2E tests, please apply the ~"pipeline:run-all-e2e" label and trigger a new pipeline. This will run all tests in `e2e:package-and-test` pipeline. + To run all E2E tests, apply the ~"pipeline:run-all-e2e" label and run a new pipeline. - The E2E test jobs are allowed to fail due to [flakiness](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/test-metrics-dashboards/#package-and-test). For the list of known failures please refer to [the latest pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). + E2E test jobs are allowed to fail due to [flakiness](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/test-metrics-dashboards/#package-and-test). + See current failures at the latest [pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). - Once done, please apply the ✅ emoji on this comment. + Once done, apply the ✅ emoji on this comment. - For any questions or help in reviewing the E2E test results, please reach out on the internal #quality Slack channel. + For any questions or help, reach out on the internal #quality Slack channel. <!-- Run e2e warning end --> MARKDOWN end |