Skip to content

Revert "Merge branch 'backport-fix-remaining-prepend-lines' into 'master'"

Mark Lapierre requested to merge revert-8374dd56 into master

What does this MR do?

The change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31379 caused QA jobs to fail with LoadError: cannot load such file -- /home/lib/gitlab

This is because when the QA images are built, they're built from the qa subfolder, so the code in parent directories isn't available.

Access to that code will require a change to the way images are built. But for now I'd like to revert the change so the QA jobs can run.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65607

Does this MR meet the acceptance criteria?

Conformity

Performance and testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Mark Lapierre

Merge request reports