Skip to content

Fix pipeline failures

张泽华请求将fix-pipeline-230511合并到main-jh

What does this MR do and why?

  1. Upstream updated the implementation of method gitlab_com_group_member? in Gitlab::Com, related to commit https://gitlab.com/gitlab-org/gitlab/-/commit/4987152cdbd516447a38b1b8287a0daf897719e5#e920b32ad7692908f6d7b1a083236a890348df3d . This change causes the pipelines about GitLab member failed. So I skip those cases.
  2. JH overwrote layouts/devise.html.haml that will render layouts/_broadcast, and upstream removed = render "layouts/broadcast" from layouts/devise.html.haml, this will cause the pipeline failed. related to commit https://gitlab.com/gitlab-org/gitlab/-/commit/368b78e1a4ee6ccc82d0beed4c82e64b0b9e56a6

Effects

The point 1 will affects:

  1. issue/discussions API, it will add a filed is_gitlab_employee to the note['author'] field of api response if the user is GitLab employee.
  2. issue/show page, it will display a GitLab Team Member badge next to the user's name if the user is GitLab employee.
  3. /experiments API, it will returns the feature flag details for GitLab team members.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

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.

张泽华 编辑于

合并请求报告

加载中