.editorconfig

@@ -17,5 +17,18 @@ charset = utf-8
 [*.{md,markdown,js.snap}]
 trim_trailing_whitespace = false
 
+[doc/**/*.md]
+trim_trailing_whitespace = true
+
 [*.rb]
 max_line_length = 120
+
+# Don't apply editorconfig rules to vendor/ resources
+[vendor/**]
+charset = unset
+end_of_line = unset
+indent_size = unset
+indent_style = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+max_line_length = unset

.eslintrc.yml

@@ -135,6 +135,7 @@ overrides:
     rules:
       '@gitlab/require-i18n-strings': off
       '@gitlab/no-runtime-template-compiler': off
+      'require-await': error
       'import/no-dynamic-require': off
       'no-import-assign': off
       'no-restricted-syntax':

.gitlab/CODEOWNERS

@@ -751,7 +751,7 @@ lib/gitlab/checks/** @proglottis @toon
 /doc/development/policies.md @jglassman1
 /doc/development/project_templates.md @aqualls
 /doc/development/prometheus_metrics.md @msedlakjakubowski
-/doc/development/real_time.md @msedlakjakubowski
+/doc/development/real_time.md @jglassman1
 /doc/development/rubocop_development_guide.md @sselhorn
 /doc/development/search/ @ashrafkhamis
 /doc/development/sec/ @rdickenson
@@ -817,7 +817,7 @@ lib/gitlab/checks/** @proglottis @toon
 /doc/tutorials/ @kpaizee
 /doc/tutorials/create_compliance_pipeline.md @eread
 /doc/tutorials/fuzz_testing_tutorial.md @rdickenson
-/doc/tutorials/scan_result_policy.md @dianalogan
+/doc/tutorials/scan_result_policy.md @rdickenson
 /doc/update/ @axil
 /doc/update/background_migrations.md @aqualls
 /doc/user/admin_area/analytics/ @lciutacu
@@ -834,7 +834,7 @@ lib/gitlab/checks/** @proglottis @toon
 /doc/user/admin_area/monitoring/ @msedlakjakubowski
 /doc/user/admin_area/reporting/git_abuse_rate_limit.md @phillipwells
 /doc/user/admin_area/reporting/spamcheck.md @axil
-/doc/user/admin_area/review_abuse_reports.md @jglassman1
+/doc/user/admin_area/review_abuse_reports.md @phillipwells
 /doc/user/admin_area/settings/account_and_limit_settings.md @aqualls
 /doc/user/admin_area/settings/continuous_integration.md @drcatherinepope
 /doc/user/admin_area/settings/deprecated_api_rate_limits.md @aqualls
@@ -864,17 +864,12 @@ lib/gitlab/checks/** @proglottis @toon
 /doc/user/analytics/ @lciutacu
 /doc/user/analytics/ci_cd_analytics.md @phillipwells
 /doc/user/application_security/ @rdickenson
-/doc/user/application_security/policies/ @dianalogan
 /doc/user/asciidoc.md @aqualls
 /doc/user/award_emojis.md @msedlakjakubowski
 /doc/user/clusters/ @phillipwells
+/doc/user/compliance/ @rdickenson
 /doc/user/compliance/compliance_report/ @eread
 /doc/user/compliance/index.md @eread
-/doc/user/compliance/license_approval_policies.md @dianalogan
-/doc/user/compliance/license_check_rules.md @dianalogan
-/doc/user/compliance/license_compliance/ @rdickenson
-/doc/user/compliance/license_list.md @rdickenson
-/doc/user/compliance/license_scanning_of_cyclonedx_files/ @rdickenson
 /doc/user/crm/ @msedlakjakubowski
 /doc/user/discussions/ @aqualls
 /doc/user/enterprise_user/ @jglassman1

.gitlab/ci/package-and-test/main.gitlab-ci.yml

@@ -11,7 +11,7 @@ include:
   - local: .gitlab/ci/package-and-test/rules.gitlab-ci.yml
   - local: .gitlab/ci/package-and-test/variables.gitlab-ci.yml
   - project: gitlab-org/quality/pipeline-common
-    ref: 3.1.0
+    ref: 3.1.2
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/allure-report.yml

.gitlab/ci/qa.gitlab-ci.yml

@@ -108,7 +108,9 @@ e2e:package-and-test-ce:
     PIPELINE_NAME: E2E Omnibus GitLab CE
 
 e2e:package-and-test-super-sidebar:
-  extends: e2e:package-and-test-ee
+  extends:
+    - e2e:package-and-test-ee
+    - .qa:rules:package-and-test-sidebar
   when: manual
   variables:
     QA_SUPER_SIDEBAR_ENABLED: "true"

.gitlab/ci/release-environments/main.gitlab-ci.yml

@@ -4,6 +4,7 @@ default:
 
 stages:
   - prepare
+  - deploy
 
 include:
   - local: .gitlab/ci/global.gitlab-ci.yml
@@ -56,7 +57,38 @@ release-environments-build-cng:
     GITLAB_SHELL_VERSION: "${GITLAB_SHELL_VERSION}"
     GITALY_SERVER_VERSION: "${GITALY_SERVER_VERSION}"
     RUBY_VERSION: "${FULL_RUBY_VERSION}"
+    IMAGE_TAG_EXT: "-${CI_COMMIT_SHORT_SHA}"
   trigger:
     project: gitlab-org/build/CNG-mirror
     branch: $TRIGGER_BRANCH
     strategy: depend
+
+release-environments-deploy-env:
+  allow_failure: true
+  stage: deploy
+  needs: ["release-environments-build-cng"]
+  variables:
+    DEPLOY_ENV: deploy.env
+  script:
+    - ./scripts/construct-release-environments-versions.rb > $DEPLOY_ENV
+  artifacts:
+    reports:
+      dotenv: $DEPLOY_ENV
+    paths:
+      - $DEPLOY_ENV
+    expire_in: 7 days
+    when: always
+
+release-environments-deploy:
+  allow_failure: true
+  stage: deploy
+  needs: ["release-environments-deploy-env"]
+  inherit:
+    variables: false
+  variables:
+    VERSIONS: "${VERSIONS}"
+    ENVIRONMENT: "${ENVIRONMENT}"
+  trigger:
+    project: gl-infra/release-environments
+    branch: main
+    strategy: depend

.gitlab/ci/review-apps/qa.gitlab-ci.yml

 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 3.1.0
+    ref: 3.1.2
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/allure-report.yml

.gitlab/ci/rules.gitlab-ci.yml

@@ -1406,6 +1406,19 @@
       when: manual
       allow_failure: true
 
+.qa:rules:package-and-test-sidebar:
+  rules:
+    - !reference [".qa:rules:package-and-test-mrs", rules]
+    - <<: *if-dot-com-gitlab-org-schedule
+      allow_failure: true
+      variables:
+        SKIP_REPORT_IN_ISSUES: "true"
+        PROCESS_TEST_RESULTS: "false"
+        KNAPSACK_GENERATE_REPORT: "false"
+        UPDATE_QA_CACHE: "false"
+        QA_SAVE_TEST_METRICS: "true"
+        QA_EXPORT_TEST_METRICS: "false" # on main runs, metrics are exported to separate bucket via rake task for better consistency
+
 ###############
 # Rails rules #
 ###############

.rubocop_todo/gitlab/strong_memoize_attr.yml

@@ -317,7 +317,7 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/app/helpers/ee/preferences_helper.rb'
     - 'ee/app/helpers/ee/registrations_helper.rb'
     - 'ee/app/helpers/ee/timeboxes_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
+    - 'ee/app/helpers/trials_helper.rb'
     - 'ee/app/helpers/ee/welcome_helper.rb'
     - 'ee/app/helpers/license_monitoring_helper.rb'
     - 'ee/app/helpers/subscriptions_helper.rb'

.rubocop_todo/layout/first_hash_element_indentation.yml

@@ -46,7 +46,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/app/graphql/mutations/iterations/update.rb'
     - 'ee/app/helpers/ee/geo_helper.rb'
     - 'ee/app/helpers/ee/groups/group_members_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/models/ee/list.rb'
     - 'ee/app/services/app_sec/dast/profiles/update_service.rb'
     - 'ee/app/services/elastic/cluster_reindexing_service.rb'

.rubocop_todo/layout/line_length.yml

@@ -1042,7 +1042,6 @@ Layout/LineLength:
     - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/helpers/ee/search_helper.rb'
     - 'ee/app/helpers/ee/subscribable_banner_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/helpers/epics_helper.rb'
     - 'ee/app/helpers/gitlab_subscriptions/upcoming_reconciliation_helper.rb'
     - 'ee/app/helpers/groups/security_features_helper.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -533,7 +533,6 @@ RSpec/ContextWording:
     - 'ee/spec/policies/project_snippet_policy_spec.rb'
     - 'ee/spec/policies/protected_branch_policy_spec.rb'
     - 'ee/spec/policies/saml_provider_policy_spec.rb'
-    - 'ee/spec/presenters/approval_rule_presenter_spec.rb'
     - 'ee/spec/presenters/audit_event_presenter_spec.rb'
     - 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
     - 'ee/spec/presenters/ee/issue_presenter_spec.rb'

.rubocop_todo/rspec/factory_bot/avoid_create.yml

@@ -50,7 +50,7 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/helpers/ee/security_orchestration_helper_spec.rb'
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
     - 'ee/spec/helpers/ee/todos_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
+    - 'ee/spec/helpers/trials_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
     - 'ee/spec/helpers/ee/welcome_helper_spec.rb'
     - 'ee/spec/helpers/ee/wiki_helper_spec.rb'
@@ -100,7 +100,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'ee/spec/mailers/emails/user_cap_spec.rb'
     - 'ee/spec/mailers/license_mailer_spec.rb'
     - 'ee/spec/mailers/notify_spec.rb'
-    - 'ee/spec/presenters/approval_rule_presenter_spec.rb'
     - 'ee/spec/presenters/audit_event_presenter_spec.rb'
     - 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
     - 'ee/spec/presenters/ci/minutes/usage_presenter_spec.rb'

.rubocop_todo/rspec/missing_feature_category.yml

@@ -521,7 +521,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
     - 'ee/spec/helpers/ee/system_note_helper_spec.rb'
     - 'ee/spec/helpers/ee/todos_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
     - 'ee/spec/helpers/ee/trial_registration_helper_spec.rb'
     - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
     - 'ee/spec/helpers/ee/version_check_helper_spec.rb'
@@ -1347,7 +1346,6 @@ RSpec/MissingFeatureCategory:
     - 'ee/spec/policies/user_policy_spec.rb'
     - 'ee/spec/policies/vulnerability_policy_spec.rb'
     - 'ee/spec/presenters/analytics/cycle_analytics/stage_presenter_spec.rb'
-    - 'ee/spec/presenters/approval_rule_presenter_spec.rb'
     - 'ee/spec/presenters/audit_event_presenter_spec.rb'
     - 'ee/spec/presenters/ci/build_presenter_spec.rb'
     - 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'

.rubocop_todo/rspec/verified_doubles.yml

@@ -31,7 +31,6 @@ RSpec/VerifiedDoubles:
     - 'ee/spec/helpers/ee/ci/runners_helper_spec.rb'
     - 'ee/spec/helpers/ee/integrations_helper_spec.rb'
     - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
-    - 'ee/spec/helpers/ee/trial_helper_spec.rb'
     - 'ee/spec/helpers/ee/trial_registration_helper_spec.rb'
     - 'ee/spec/helpers/kerberos_helper_spec.rb'
     - 'ee/spec/helpers/license_helper_spec.rb'

.rubocop_todo/style/empty_else.yml

@@ -29,7 +29,6 @@ Style/EmptyElse:
     - 'ee/app/controllers/admin/audit_logs_controller.rb'
     - 'ee/app/controllers/ee/groups_controller.rb'
     - 'ee/app/helpers/ee/kerberos_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/models/ee/audit_event.rb'
     - 'ee/app/services/ee/users/update_service.rb'
     - 'ee/app/services/epics/tree_reorder_service.rb'

.rubocop_todo/style/empty_method.yml

@@ -49,7 +49,6 @@ Style/EmptyMethod:
     - 'app/controllers/projects/triggers_controller.rb'
     - 'app/controllers/pwa_controller.rb'
     - 'app/controllers/search_controller.rb'
-    - 'app/experiments/security_actions_continuous_onboarding_experiment.rb'
     - 'app/graphql/resolvers/concerns/caching_array_resolver.rb'
     - 'app/helpers/subscribable_banner_helper.rb'
     - 'app/helpers/users/callouts_helper.rb'

.rubocop_todo/style/percent_literal_delimiters.yml

@@ -191,7 +191,6 @@ Style/PercentLiteralDelimiters:
     - 'ee/app/helpers/ee/issues_helper.rb'
     - 'ee/app/helpers/ee/labels_helper.rb'
     - 'ee/app/helpers/ee/nav_helper.rb'
-    - 'ee/app/helpers/ee/trial_helper.rb'
     - 'ee/app/mailers/previews/ci_minutes_usage_mailer_preview.rb'
     - 'ee/app/mailers/previews/emails/namespace_storage_usage_mailer_preview.rb'
     - 'ee/app/mailers/previews/license_mailer_preview.rb'

CHANGELOG.md

@@ -1552,6 +1552,12 @@ entry.
 - [Remove Gitlab::Redis::DuplicateJobs](gitlab-org/gitlab@73d863b0a49175cce7649c0936b2e16157f61665) ([merge request](gitlab-org/gitlab!109122))
 - [Clean-up feature flag `hash_based_cache_for_protected_branches`](gitlab-org/gitlab@96e8a07564bac07a100556e00ce4af3f21dca293) ([merge request](gitlab-org/gitlab!108724))
+## 15.8.6 (2023-04-18)
+
+### Fixed (1 change)
+
+- [Fix automatically-retried jobs stuck in pending state](gitlab-org/gitlab@6db2bf65f0273af547dc84e338db952de0206ada) ([merge request](gitlab-org/gitlab!117283))
+
 ## 15.8.5 (2023-03-30)
 ### Security (16 changes)

GITALY_SERVER_VERSION

-24badf7502c1864dc59e4f19bbebe53a1d36b638
+5660b156be328c7be18df892ccb7149fea21e491