Skip to content

Revert "Merge branch '239031-yo-remove-avatar-blocked-user' into 'master'"

Marius Bobin requested to merge revert-056e4ed0 into master

What does this MR do?

Revert changes introduced by !52051 (merged)

https://sentry.gitlab.net/gitlab/gitlabcom/issues/2471848/?query=is%3Aunresolved%20url%3Ahttps%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fgitlab%2F-%2Fsettings%2Fci_cd

This merge request broke the /-/settings/ci_cd page when there are Pipeline subscriptions defined with projects that are owned by groups: https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#trigger-a-pipeline-when-an-upstream-project-is-rebuilt

  • Create namespace A and B, each with it's own project: C and D
  • Go to /A/C/-/settings/ci_cd
  • Expand Pipeline subscriptions
  • Add B/D as a subscription and press the subscribe button.
  • undefined method 'blocked?' for #<Group id:192> error should appear.

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability 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 Marius Bobin

Merge request reports

Loading