Skip to content
Snippets Groups Projects
Commit 9b367d81 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

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
parents bf5e49ec 69f6e347
No related merge requests found
Showing
with 177 additions and 279 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment