Skip to content

Merge Security master into Canonical master

John Skarbek requested to merge jts/fix-conflicts-on-master-merge into master

What does this MR do and why?

Repairs conflicts during Security release process on the following files:

  • spec/lib/gitlab/ci/config/external/file/base_spec.rb
  • spec/lib/gitlab/ci/config/external/file/project_spec.rb
  • spec/lib/gitlab/ci/config/external/file/template_spec.rb

Describe in detail what your merge request does and why.

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by John Skarbek

Merge request reports