Merge remote-tracking branch 'ee/master' into main-jh
* ee/master: (920 commits) Gitlab renovate forks/gitlab renovate/gitlab uisvg Create new way of encrypting tokens - phase 1 - reader Remove fake shim for mimemagic Change empty state message Allow Email Replies to Notes to Create Discussions Remove allowlist from batch_loader Bump kas to v13.11.1 Pages: Add feature flag to disable deployment to legacy storage Remove stages definition from latest API Fuzzing CI template Configure Pipeline validation Service with ApplicationSetting Pin API Fuzzing version to 1.6 Remove standalone_vuln_dependency_list Feature Flag [RUN ALL RSPEC] [RUN AS-IF-FOSS] Change API Security port number to 5000 Refer to expired SSH keys in the past tense Fix EmptyLineAfterFinalLetItBe in spec/services/design_management Update Lean Feature Proposal.md Update Feature proposal.md Update MobSF to version 3.4.0 in the SAST template Update install jira application steps Implement DB `use_replicas_for_read_queries` ... Conflicts: lib/gitlab.rb spec/lib/gitlab_spec.rb
Showing
- .gitlab-ci.yml 6 additions, 2 deletions.gitlab-ci.yml
- .gitlab/CODEOWNERS 3 additions, 2 deletions.gitlab/CODEOWNERS
- .gitlab/ci/dast.gitlab-ci.yml 1 addition, 1 deletion.gitlab/ci/dast.gitlab-ci.yml
- .gitlab/ci/docs.gitlab-ci.yml 2 additions, 4 deletions.gitlab/ci/docs.gitlab-ci.yml
- .gitlab/ci/frontend.gitlab-ci.yml 1 addition, 1 deletion.gitlab/ci/frontend.gitlab-ci.yml
- .gitlab/ci/global.gitlab-ci.yml 4 additions, 4 deletions.gitlab/ci/global.gitlab-ci.yml
- .gitlab/ci/rails.gitlab-ci.yml 25 additions, 28 deletions.gitlab/ci/rails.gitlab-ci.yml
- .gitlab/ci/rules.gitlab-ci.yml 11 additions, 0 deletions.gitlab/ci/rules.gitlab-ci.yml
- .gitlab/ci/untamper-my-lockfile.yml 26 additions, 0 deletions.gitlab/ci/untamper-my-lockfile.yml
- .gitlab/ci/vendored-gems.gitlab-ci.yml 7 additions, 0 deletions.gitlab/ci/vendored-gems.gitlab-ci.yml
- .gitlab/ci/workhorse.gitlab-ci.yml 5 additions, 9 deletions.gitlab/ci/workhorse.gitlab-ci.yml
- .gitlab/issue_templates/Experimentation.md 1 addition, 1 deletion.gitlab/issue_templates/Experimentation.md
- .gitlab/issue_templates/Feature proposal.md 2 additions, 0 deletions.gitlab/issue_templates/Feature proposal.md
- .gitlab/issue_templates/Lean Feature Proposal.md 3 additions, 0 deletions.gitlab/issue_templates/Lean Feature Proposal.md
- .gitlab/issue_templates/Security developer workflow.md 2 additions, 2 deletions.gitlab/issue_templates/Security developer workflow.md
- .gitlab/merge_request_templates/Quarantine End to End Test.md 6 additions, 6 deletions...lab/merge_request_templates/Quarantine End to End Test.md
- .haml-lint.yml 0 additions, 6 deletions.haml-lint.yml
- .rubocop.yml 13 additions, 0 deletions.rubocop.yml
- .rubocop_manual_todo.yml 59 additions, 206 deletions.rubocop_manual_todo.yml
- .rubocop_todo.yml 0 additions, 7 deletions.rubocop_todo.yml
Please register or sign in to comment