Skip to content
代码片段 群组 项目
提交 cadb598b 编辑于 作者: Thong Kuah's avatar Thong Kuah
浏览文件

Merge branch '404901-add-license-check-to-summarize_diff' into 'master'

Put summarize_diff_quick_action behind license check

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



Merged-by: default avatarThong Kuah <tkuah@gitlab.com>
Approved-by: default avatarThong Kuah <tkuah@gitlab.com>
Approved-by: default avatarGary Holtz <gholtz@gitlab.com>
Co-authored-by: default avatarKerri Miller <kerrizor@kerrizor.com>
No related branches found
No related tags found
无相关合并请求
...@@ -239,6 +239,7 @@ class Features ...@@ -239,6 +239,7 @@ class Features
security_orchestration_policies security_orchestration_policies
security_training security_training
ssh_key_expiration_policy ssh_key_expiration_policy
summarize_diff_quick_action
summarize_notes summarize_notes
stale_runner_cleanup_for_namespace stale_runner_cleanup_for_namespace
status_page status_page
......
...@@ -28,7 +28,8 @@ module MergeRequestActions ...@@ -28,7 +28,8 @@ module MergeRequestActions
types MergeRequest types MergeRequest
condition do condition do
::Feature.enabled?(:openai_experimentation, current_user) && ::Feature.enabled?(:openai_experimentation, current_user) &&
::Feature.enabled?(:summarize_diff_quick_action, current_user) ::Feature.enabled?(:summarize_diff_quick_action, current_user) &&
::License.feature_available?(:summarize_diff_quick_action)
end end
command :summarize_diff do command :summarize_diff do
::MergeRequests::Llm::SummarizeMergeRequestWorker.new.perform( ::MergeRequests::Llm::SummarizeMergeRequestWorker.new.perform(
......
...@@ -453,6 +453,10 @@ ...@@ -453,6 +453,10 @@
context "summarize_diff command" do context "summarize_diff command" do
let(:content) { "/summarize_diff" } let(:content) { "/summarize_diff" }
before do
stub_licensed_features(summarize_diff_quick_action: true)
end
context "when :openai_experimentation feature flag is disabled" do context "when :openai_experimentation feature flag is disabled" do
before do before do
stub_feature_flags(openai_experimentation: false) stub_feature_flags(openai_experimentation: false)
...@@ -482,6 +486,18 @@ ...@@ -482,6 +486,18 @@
stub_feature_flags(openai_experimentation: true) stub_feature_flags(openai_experimentation: true)
end end
context "when summarize_diff_quick_action is disabled" do
before do
stub_licensed_features(summarize_diff_quick_action: false)
end
it "doesn't apply /summarize_diff" do
_, _, msg = service.execute(content, merge_request)
expect(msg).to include("Could not apply summarize_diff command")
end
end
it "applies /summarize_diff" do it "applies /summarize_diff" do
_, _, msg = service.execute(content, merge_request) _, _, msg = service.execute(content, merge_request)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册