diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index ddbbbac9b00..f5552c411a0 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -114,7 +114,7 @@ include: - bundle exec gem list gitlab_quality-test_tooling - | section_start "failed-test-issues" "Report test failures" - if [ "$CREATE_RAILS_TEST_FAILURE_ISSUES" == "true" ]; then + if [[ "$CREATE_RAILS_TEST_FAILURE_ISSUES" == "true" ]] && [[ -n "$TEST_FAILURES_PROJECT_TOKEN" ]]; then input_file="rspec/rspec-${CI_JOB_ID}.json" # The actual failures will always be part of the retry report @@ -129,12 +129,12 @@ include: --exclude-labels-for-search "QA,knapsack_report" \ --related-issues-file "rspec/${CI_JOB_ID}-failed-test-issues.json"; else - echoinfo "Not reporting test failures because \$CREATE_RAILS_TEST_FAILURE_ISSUES != 'true'" + echoinfo "Not reporting test failures because \$CREATE_RAILS_TEST_FAILURE_ISSUES != 'true' or TEST_FAILURES_PROJECT_TOKEN is not set" fi section_end "failed-test-issues" - | section_start "flaky-test-issues" "Report test flakiness" - if [ "$CREATE_RAILS_FLAKY_TEST_ISSUES" == "true" ]; then + if [[ "$CREATE_RAILS_FLAKY_TEST_ISSUES" == "true" ]] && [[ -n "$TEST_FAILURES_PROJECT_TOKEN" ]]; then if [ -f "rspec/rspec-retry-${CI_JOB_ID}.json" ]; then bundle exec flaky-test-issues \ --token "${TEST_FAILURES_PROJECT_TOKEN}" \ @@ -144,43 +144,43 @@ include: echoerr "Not reporting test flakiness because 'rspec/rspec-retry-${CI_JOB_ID}.json' is missing!" fi else - echoinfo "Not reporting test flakiness because \$CREATE_RAILS_FLAKY_TEST_ISSUES != 'true'" + echoinfo "Not reporting test flakiness because \$CREATE_RAILS_FLAKY_TEST_ISSUES != 'true' or TEST_FAILURES_PROJECT_TOKEN is not set" fi section_end "flaky-test-issues" - | section_start "slow-test-issues" "Report test slowness" - if [ "$CREATE_RAILS_SLOW_TEST_ISSUES" == "true" ]; then + if [[ "$CREATE_RAILS_SLOW_TEST_ISSUES" == "true" ]] && [[ -n "$TEST_FAILURES_PROJECT_TOKEN" ]]; then bundle exec slow-test-issues \ --token "${TEST_FAILURES_PROJECT_TOKEN}" \ --project "gitlab-org/gitlab" \ --input-files "rspec/rspec-*.json" \ --related-issues-file "rspec/${CI_JOB_ID}-slow-test-issues.json"; else - echoinfo "Not reporting test slowness because \$CREATE_RAILS_SLOW_TEST_ISSUES != 'true'" + echoinfo "Not reporting test slowness because \$CREATE_RAILS_SLOW_TEST_ISSUES != 'true' or TEST_FAILURES_PROJECT_TOKEN is not set" fi section_end "slow-test-issues" - | section_start "slow-test-merge-request-report-note" "Report test slowness in MR note" - if [ "$ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST" == "true" ]; then + if [[ "$ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST" == "true" ]] && [[ -n "$TEST_SLOW_NOTE_PROJECT_TOKEN" ]]; then bundle exec slow-test-merge-request-report-note \ --token "${TEST_SLOW_NOTE_PROJECT_TOKEN}" \ --project "gitlab-org/gitlab" \ --input-files "rspec/rspec-*.json" \ --merge_request_iid "$CI_MERGE_REQUEST_IID"; else - echoinfo "Not reporting test slowness in MR note because \$ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST != 'true'" + echoinfo "Not reporting test slowness in MR note because \$ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST != 'true' or TEST_SLOW_NOTE_PROJECT_TOKEN is not set" fi section_end "slow-test-merge-request-report-note" - | section_start "knapsack-report-issues" "Report test files close to timing out" - if [ "$ALLOW_KNAPSACK_REPORT_CREATE_ISSUES" == "true" ]; then + if [[ "$ALLOW_KNAPSACK_REPORT_CREATE_ISSUES" == "true" ]] && [[ -n "$KNAPSACK_REPORT_ISSUES_PROJECT_TOKEN" ]]; then bundle exec knapsack-report-issues \ --token "${KNAPSACK_REPORT_ISSUES_PROJECT_TOKEN}" \ --project "gitlab-org/gitlab" \ --input-file knapsack/rspec*_report.json \ --expected-report knapsack/node_specs_expected_duration.json; else - echoinfo "Not reporting test files close to timing out because \$ALLOW_KNAPSACK_REPORT_CREATE_ISSUES != 'true'" + echoinfo "Not reporting test files close to timing out because \$ALLOW_KNAPSACK_REPORT_CREATE_ISSUES != 'true' or KNAPSACK_REPORT_ISSUES_PROJECT_TOKEN is not set" fi section_end "knapsack-report-issues" - tooling/bin/push_job_metrics || true diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index a8bcce98957..9e4cdd1a4ca 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -275,7 +275,6 @@ RSpec/BeEq: - 'ee/spec/models/onboarding_spec.rb' - 'ee/spec/models/product_analytics/funnel_spec.rb' - 'ee/spec/models/project_feature_spec.rb' - - 'ee/spec/models/projects/all_branches_rule_spec.rb' - 'ee/spec/models/projects/all_protected_branches_rule_spec.rb' - 'ee/spec/models/push_rule_spec.rb' - 'ee/spec/models/requirements_management/requirement_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 368e377bd0a..a32e44e5a7b 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -596,7 +596,6 @@ RSpec/NamedSubject: - 'ee/spec/models/product_analytics/panel_spec.rb' - 'ee/spec/models/product_analytics/visualization_spec.rb' - 'ee/spec/models/project_feature_spec.rb' - - 'ee/spec/models/projects/all_branches_rule_spec.rb' - 'ee/spec/models/projects/all_protected_branches_rule_spec.rb' - 'ee/spec/models/projects/target_branch_rule_spec.rb' - 'ee/spec/models/protected_environment_spec.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index f15d1d47559..5e922ff55dc 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -0d6c9b04da0dc111925ff7828b2ccf749266c2e8 +12d49304c0163157cce8cf5aa46d5caf7384f976 diff --git a/Gemfile b/Gemfile index 041489a9a28..2b1f4481437 100644 --- a/Gemfile +++ b/Gemfile @@ -645,7 +645,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat gem 'gitaly', '~> 17.8.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.8.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 diff --git a/Gemfile.checksum b/Gemfile.checksum index 55c2f62bafe..a3c6699e7cf 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -233,7 +233,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-darwin","checksum":"ec6775054481b3e07a97d4be945fe41d043f89dc1fa1d95cdfc6a70b439ea0e4"}, {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-linux-gnu","checksum":"ebcccc617db4f669cd2de900e6d31fae5de67acedeb178d242063e338cb57050"}, {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-linux-musl","checksum":"77cf356f2a2fc496ec17206d68a6a1fe4f4d680bc1aac2206c32ee5393611a15"}, -{"name":"gitlab-kas-grpc","version":"17.8.1","platform":"ruby","checksum":"fbb9cf7411d12a7dc491d688a80a1d4064bd92dfbbadce523a549b07d26226e6"}, +{"name":"gitlab-kas-grpc","version":"17.9.0.pre.rc2","platform":"ruby","checksum":"b4572e47d0807e51c7a8f7a43d44a196ebea40ed073b8cb95f72d20044ea4482"}, {"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, diff --git a/Gemfile.lock b/Gemfile.lock index 8b953f71cf4..826f590e2ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -745,7 +745,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.27) rb_sys (~> 0.9.109) - gitlab-kas-grpc (17.8.1) + gitlab-kas-grpc (17.9.0.pre.rc2) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -2094,7 +2094,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.8.0) + gitlab-kas-grpc (~> 17.9.0.pre.rc2) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index f79428fe108..ddc65e97d62 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -233,7 +233,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-darwin","checksum":"ec6775054481b3e07a97d4be945fe41d043f89dc1fa1d95cdfc6a70b439ea0e4"}, {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-linux-gnu","checksum":"ebcccc617db4f669cd2de900e6d31fae5de67acedeb178d242063e338cb57050"}, {"name":"gitlab-glfm-markdown","version":"0.0.27","platform":"x86_64-linux-musl","checksum":"77cf356f2a2fc496ec17206d68a6a1fe4f4d680bc1aac2206c32ee5393611a15"}, -{"name":"gitlab-kas-grpc","version":"17.8.1","platform":"ruby","checksum":"fbb9cf7411d12a7dc491d688a80a1d4064bd92dfbbadce523a549b07d26226e6"}, +{"name":"gitlab-kas-grpc","version":"17.9.0.pre.rc2","platform":"ruby","checksum":"b4572e47d0807e51c7a8f7a43d44a196ebea40ed073b8cb95f72d20044ea4482"}, {"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index e43b98d99f3..996ca6c3264 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -757,7 +757,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.27) rb_sys (~> 0.9.109) - gitlab-kas-grpc (17.8.1) + gitlab-kas-grpc (17.9.0.pre.rc2) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -2129,7 +2129,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.8.0) + gitlab-kas-grpc (~> 17.9.0.pre.rc2) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue index 2593da5ec37..3953ae22915 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue @@ -46,10 +46,6 @@ export default { }); }, }, - popoverOptions: { - triggers: 'hover', - placement: 'bottom', - }, };