Skip to content
代码片段 群组 项目
未验证 提交 3adab7ef 编辑于 作者: Igor Drozdov's avatar Igor Drozdov 提交者: GitLab
浏览文件

Merge branch 'id-fix-duo-page-on-staging-ref' into 'master'

Fix Gitlab Duo page 404 error on Staging Ref

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182949



Merged-by: default avatarIgor Drozdov <idrozdov@gitlab.com>
Approved-by: default avatarKeeyan Nejad <knejad@gitlab.com>
Approved-by: default avatarNikola Milojevic <nmilojevic@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
......@@ -21,7 +21,7 @@ def show; end
private
def ensure_feature_available!
render_404 if Gitlab.com? # rubocop:disable Gitlab/AvoidGitlabInstanceChecks -- Not related to SaaS offerings
render_404 if gitlab_com_subscription?
render_404 unless License.current&.paid?
end
end
......
......@@ -95,7 +95,7 @@
context 'when instance is on GitLab.com' do
before do
allow(Gitlab).to receive(:com?).and_return(true)
stub_saas_features(gitlab_com_subscriptions: true)
end
it_behaves_like 'hides gitlab duo path'
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册