diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 6c1a135573b..577201cf016 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1839,11 +1839,6 @@ - when: manual allow_failure: true -.setup:rules:gitlab_git_test: - rules: - - <<: *if-default-refs - changes: *code-backstage-patterns - .setup:rules:no-ee-check: rules: - <<: *if-not-foss diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 4f3111de2bf..81b266686ef 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -43,14 +43,6 @@ dont-interrupt-me: script: - echo "This jobs makes sure this pipeline won't be interrupted! See https://docs.gitlab.com/ee/ci/yaml/#interruptible." -gitlab_git_test: - extends: - - .minimal-job - - .setup:rules:gitlab_git_test - stage: test - script: - - spec/support/prepare-gitlab-git-test-for-commit --check-for-changes - no-ee-check: extends: - .minimal-job diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md index 4b628126fc9..a9f96a61d29 100644 --- a/.gitlab/issue_templates/Feature Flag Roll Out.md +++ b/.gitlab/issue_templates/Feature Flag Roll Out.md @@ -82,6 +82,7 @@ _Consider adding links to check for Sentry errors, Production logs for 5xx, 302s ### Preparation before global rollout +- [ ] Set a milestone to the rollout issue to signal for enabling and removing the feature flag when it is stable. - [ ] Check if the feature flag change needs to be accompanied with a [change management issue](https://about.gitlab.com/handbook/engineering/infrastructure/change-management/#feature-flags-and-the-change-management-process). Cross link the issue here if it does. @@ -167,5 +168,11 @@ You can either [create a follow-up issue for Feature Flag Cleanup](https://gitla /chatops run feature set false ``` -/label ~"feature flag" ~"type::feature" ~"feature::addition" + + /label ~group:: +/label ~"feature flag" +/assign me +/due in 1 month diff --git a/.rubocop.yml b/.rubocop.yml index 21e2f8f2827..223ce2c04c5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -45,7 +45,6 @@ AllCops: - 'file_hooks/**/*' - 'workhorse/**/*' - 'shared/packages/**/*' - - 'spec/support/*.git/**/*' # e.g. spec/support/gitlab-git-test.git - 'db/ci_migrate/*.rb' # since the `db/ci_migrate` is a symlinked to `db/migrate` # Use absolute path to avoid orphan directories with changed workspace root. CacheRootDirectory: <%= Dir.getwd %>/tmp diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 3263204cb3f..8e295c68623 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -1176,7 +1176,6 @@ Style/IfUnlessModifier: - 'spec/support/helpers/lets_encrypt_helpers.rb' - 'spec/support/helpers/live_debugger.rb' - 'spec/support/helpers/modal_helpers.rb' - - 'spec/support/helpers/seed_helper.rb' - 'spec/support/helpers/stub_gitlab_calls.rb' - 'spec/support/helpers/stubbed_feature.rb' - 'spec/support/helpers/test_env.rb' diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index febc15521c3..472a722ed22 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -1154,7 +1154,6 @@ Style/PercentLiteralDelimiters: - 'spec/support/helpers/login_helpers.rb' - 'spec/support/helpers/prometheus_helpers.rb' - 'spec/support/helpers/repo_helpers.rb' - - 'spec/support/helpers/seed_helper.rb' - 'spec/support/helpers/seed_repo.rb' - 'spec/support/helpers/test_env.rb' - 'spec/support/helpers/usage_data_helpers.rb' diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml index ec15edbc206..ad425b53e59 100644 --- a/.rubocop_todo/style/string_concatenation.yml +++ b/.rubocop_todo/style/string_concatenation.yml @@ -329,7 +329,6 @@ Style/StringConcatenation: - 'spec/support/shared_examples/models/wiki_shared_examples.rb' - 'spec/support/shared_examples/requests/api/hooks_shared_examples.rb' - 'spec/support/shared_examples/requests/snippet_shared_examples.rb' - - 'spec/support/unpack-gitlab-git-test' - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb' - 'spec/uploaders/job_artifact_uploader_spec.rb' - 'spec/validators/addressable_url_validator_spec.rb' diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index b5a88f97d83..22381377389 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -150,7 +150,12 @@ export default {