Skip to content

Fix: ALL_PREMIUM_FEATURES and ULTIMATE_FEATURES cannot be intersected

路志远请求将fix-jh-features-const合并到main-jh

What does this MR do and why?

Fix pipeline: https://jihulab.com/gitlab-cn/gitlab/-/jobs/4360540

Modified two files

File Significance
jh/app/models/jh/gitlab_subscriptions/features.rb Eliminate the intersection of two sets ALL_ULTIMATE_FEATURES and ULTIMATE_FEATURES
ee/spec/models/gitlab_subscriptions/features_spec.rb Fix upstream unit test, it let us not find the problem 1. See Upstream MR

As originally designed, ULTIMATE_FEATURES should only store ultimate-only features. But features.rb of jh breaks this principle.

Screenshots or screen recordings


It should be merged after this Upstream MR merge.

/cc @prajnamas @icbd

路志远 编辑于

合并请求报告

加载中