Fix pipeline failures
What does this MR do and why?
Fix pipeline failures https://jihulab.com/gitlab-cn/gitlab/-/jobs/4394240 and https://jihulab.com/gitlab-cn/gitlab/-/jobs/4394212
Related upstream commit https://gitlab.com/gitlab-org/gitlab/-/commit/9fe2a1bfcb9cf382336be86ee4d40c10c484aec7
-
jh/spec/features/groups/usage_quotas_spec.rb
Reason: Upstream added FFusage_quotas_for_all_editions
to controller the display of frontend. The page only show a sentence if we turn on this FF, so I turn off it during test run. -
spec/features/projects/blobs/blame_spec.rb
Reason: JH override the blame/show page, so upstream test can not pass, I skipped the test case.
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.
-
I have evaluated the MR acceptance checklist for this MR.