From ed2c59c4c5ec3dded962489e2a6fc418765f167b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 4 Jul 2024 10:43:06 +0100
Subject: [PATCH 1/4] Updates AI merge commit message to be GA

Changelog: added
---
 .../generate_commit_message_flag.yml          |  8 -------
 doc/user/gitlab_duo/index.md                  | 21 +++++++++----------
 .../merge_requests/duo_in_merge_requests.md   | 10 ++++-----
 .../components/ai_commit_message.vue          |  9 +-------
 .../gitlab/llm/utils/ai_features_catalogue.rb |  4 ++--
 .../generate_commit_message_service_spec.rb   | 12 -----------
 6 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100644 config/feature_flags/development/generate_commit_message_flag.yml

diff --git a/config/feature_flags/development/generate_commit_message_flag.yml b/config/feature_flags/development/generate_commit_message_flag.yml
deleted file mode 100644
index b0655fd9929a48..00000000000000
--- a/config/feature_flags/development/generate_commit_message_flag.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: generate_commit_message_flag
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120259
-rollout_issue_url:
-milestone: '16.0'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/doc/user/gitlab_duo/index.md b/doc/user/gitlab_duo/index.md
index d286158c5ff7fe..baca560a7d1e70 100644
--- a/doc/user/gitlab_duo/index.md
+++ b/doc/user/gitlab_duo/index.md
@@ -108,6 +108,16 @@ DETAILS:
 - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=ivwZQgh4Rxw)
 - [View documentation](../project/merge_requests/reviews/index.md#gitlab-duo-suggested-reviewers).
 
+### Merge commit generation
+
+DETAILS:
+**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md).
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+
+- Helps you merge more quickly by generating meaningful commit messages.
+- LLM: Vertex AI Codey [`text-bison`](https://console.cloud.google.com/vertex-ai/publishers/google/model-garden/text-bison).
+- [View documentation](../project/merge_requests/duo_in_merge_requests.md#generate-a-merge-commit-message).
+
 ## Beta features
 
 ### Merge request template population
@@ -193,17 +203,6 @@ DETAILS:
 - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=Bx6Zajyuy9k&list=PLFGfElNsQthYDx0A_FaNNfUm9NHsK6zED)
 - [View documentation](../project/merge_requests/duo_in_merge_requests.md#summarize-a-code-review).
 
-### Merge and squash commit generation
-
-DETAILS:
-**Tier:** For a limited time, Ultimate. In the future, [GitLab Duo Enterprise](../../subscriptions/subscription-add-ons.md).
-**Offering:** GitLab.com
-**Status:** Experiment
-
-- Helps you merge more quickly by generating meaningful commit messages.
-- LLM: Vertex AI Codey [`text-bison`](https://console.cloud.google.com/vertex-ai/publishers/google/model-garden/text-bison).
-- [View documentation](../project/merge_requests/duo_in_merge_requests.md#generate-a-merge-or-squash-commit-message).
-
 ### Root cause analysis
 
 DETAILS:
diff --git a/doc/user/project/merge_requests/duo_in_merge_requests.md b/doc/user/project/merge_requests/duo_in_merge_requests.md
index 009072b4e1f933..baffce882b8cb8 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -96,16 +96,16 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c
 
 - Draft comment's text
 
-## Generate a merge or squash commit message
+## Generate a merge commit message
 
 DETAILS:
-**Tier:** For a limited time, Ultimate. In the future, [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
-**Offering:** GitLab.com
-**Status:** Experiment
+**Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment).
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/jobs/7264604565) in GitLab 17.2.
 
-When preparing to merge your merge request you might wish to edit the proposed squash or merge commit message.
+When preparing to merge your merge request you might wish to edit the proposed merge commit message.
 
 To generate a commit message with GitLab Duo:
 
diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
index 97e0e22d2291b2..9f2f312d21a71e 100644
--- a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlBadge, GlModal, GlModalDirective, GlSkeletonLoader, GlLink } from '@gitlab/ui';
+import { GlButton, GlModal, GlModalDirective, GlSkeletonLoader, GlLink } from '@gitlab/ui';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import { createAlert } from '~/alert';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
@@ -37,7 +37,6 @@ export default {
   },
   components: {
     GlButton,
-    GlBadge,
     GlModal,
     GlSkeletonLoader,
     GlLink,
@@ -126,9 +125,6 @@ export default {
     >
       {{ __('Generate commit message') }}
     </gl-button>
-    <gl-badge class="gl-ml-2">
-      {{ __('Experiment') }}
-    </gl-badge>
     <gl-modal
       ref="modal"
       :aria-label="__('Commit message')"
@@ -139,9 +135,6 @@ export default {
     >
       <template #modal-title>
         {{ __('Commit message') }}
-        <gl-badge class="gl-ml-2">
-          {{ __('Experiment') }}
-        </gl-badge>
       </template>
       <gl-skeleton-loader v-if="loadingCommitMessage" :width="250" :lines="4" />
       <template v-else>
diff --git a/ee/lib/gitlab/llm/utils/ai_features_catalogue.rb b/ee/lib/gitlab/llm/utils/ai_features_catalogue.rb
index ae396db04e04f9..92451caa26c408 100644
--- a/ee/lib/gitlab/llm/utils/ai_features_catalogue.rb
+++ b/ee/lib/gitlab/llm/utils/ai_features_catalogue.rb
@@ -64,8 +64,8 @@ class AiFeaturesCatalogue
             prompt_class: ::Gitlab::Llm::Templates::GenerateCommitMessage,
             feature_category: :code_review_workflow,
             execute_method: ::Llm::GenerateCommitMessageService,
-            maturity: :experimental,
-            self_managed: false,
+            maturity: :ga,
+            self_managed: true,
             internal: false
           },
           analyze_ci_job_failure: {
diff --git a/ee/spec/services/llm/generate_commit_message_service_spec.rb b/ee/spec/services/llm/generate_commit_message_service_spec.rb
index 421cfdcaed542b..8c28adf5f0ba4c 100644
--- a/ee/spec/services/llm/generate_commit_message_service_spec.rb
+++ b/ee/spec/services/llm/generate_commit_message_service_spec.rb
@@ -50,18 +50,6 @@
         expect(Llm::CompletionWorker).not_to have_received(:perform_for)
       end
     end
-
-    context 'when feature flag is disabled' do
-      before do
-        stub_feature_flags(generate_commit_message_flag: false)
-      end
-
-      it 'returns an error' do
-        expect(subject.execute).to be_error
-
-        expect(Llm::CompletionWorker).not_to have_received(:perform_for)
-      end
-    end
   end
 
   describe '#valid?' do
-- 
GitLab


From 95ef3efb681c895d6ba48da0ec5a4aa58eca4e9e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 5 Jul 2024 15:27:35 +0100
Subject: [PATCH 2/4] Fixed failing spec

---
 .../projects/generate_commit_message_spec.rb       | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ee/spec/requests/api/graphql/mutations/projects/generate_commit_message_spec.rb b/ee/spec/requests/api/graphql/mutations/projects/generate_commit_message_spec.rb
index 18e00e2a5ea595..035b1151c2fbe5 100644
--- a/ee/spec/requests/api/graphql/mutations/projects/generate_commit_message_spec.rb
+++ b/ee/spec/requests/api/graphql/mutations/projects/generate_commit_message_spec.rb
@@ -47,20 +47,6 @@
     expect(graphql_mutation_response(:ai_action)['errors']).to eq([])
   end
 
-  context 'when ai_global_switch feature flag is disabled' do
-    before do
-      stub_feature_flags(ai_global_switch: false)
-    end
-
-    it 'returns nil' do
-      expect(Llm::CompletionWorker).not_to receive(:perform_for)
-
-      post_graphql_mutation(mutation, current_user: current_user)
-
-      expect(fresh_response_data['errors'][0]['message']).to eq("required feature flag is disabled.")
-    end
-  end
-
   context 'when experiment_features_enabled disabled' do
     before do
       group.namespace_settings.update!(experiment_features_enabled: false)
-- 
GitLab


From 26b935a69f9c6d1eae7381b1951b0f55162be384 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 8 Jul 2024 11:10:10 +0100
Subject: [PATCH 3/4] Added feature flag and made default enabled

---
 .../development/generate_commit_message_flag.yml     |  8 ++++++++
 .../project/merge_requests/duo_in_merge_requests.md  |  2 +-
 .../llm/generate_commit_message_service_spec.rb      | 12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 config/feature_flags/development/generate_commit_message_flag.yml

diff --git a/config/feature_flags/development/generate_commit_message_flag.yml b/config/feature_flags/development/generate_commit_message_flag.yml
new file mode 100644
index 00000000000000..a6403400f52acd
--- /dev/null
+++ b/config/feature_flags/development/generate_commit_message_flag.yml
@@ -0,0 +1,8 @@
+---
+name: generate_commit_message_flag
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120259
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467412
+milestone: '16.0'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/doc/user/project/merge_requests/duo_in_merge_requests.md b/doc/user/project/merge_requests/duo_in_merge_requests.md
index baffce882b8cb8..2fe0a532c98938 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -103,7 +103,7 @@ DETAILS:
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment).
-> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/jobs/7264604565) in GitLab 17.2.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158339) in GitLab 17.2.
 
 When preparing to merge your merge request you might wish to edit the proposed merge commit message.
 
diff --git a/ee/spec/services/llm/generate_commit_message_service_spec.rb b/ee/spec/services/llm/generate_commit_message_service_spec.rb
index 8c28adf5f0ba4c..421cfdcaed542b 100644
--- a/ee/spec/services/llm/generate_commit_message_service_spec.rb
+++ b/ee/spec/services/llm/generate_commit_message_service_spec.rb
@@ -50,6 +50,18 @@
         expect(Llm::CompletionWorker).not_to have_received(:perform_for)
       end
     end
+
+    context 'when feature flag is disabled' do
+      before do
+        stub_feature_flags(generate_commit_message_flag: false)
+      end
+
+      it 'returns an error' do
+        expect(subject.execute).to be_error
+
+        expect(Llm::CompletionWorker).not_to have_received(:perform_for)
+      end
+    end
   end
 
   describe '#valid?' do
-- 
GitLab


From c7d437d07b42797bb413bb818020cd291571d57c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 8 Jul 2024 15:44:54 +0100
Subject: [PATCH 4/4] Updated history in the docs

---
 doc/user/project/merge_requests/duo_in_merge_requests.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/user/project/merge_requests/duo_in_merge_requests.md b/doc/user/project/merge_requests/duo_in_merge_requests.md
index 2fe0a532c98938..cf2c88570289fc 100644
--- a/doc/user/project/merge_requests/duo_in_merge_requests.md
+++ b/doc/user/project/merge_requests/duo_in_merge_requests.md
@@ -102,8 +102,12 @@ DETAILS:
 **Tier:** Premium and Ultimate with [GitLab Duo Enterprise](../../../subscriptions/subscription-add-ons.md).
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment).
-> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158339) in GitLab 17.2.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [experiment](../../../policy/experiment-beta-support.md#experiment) [with a flag](../../../administration/feature_flags.md) named `generate_commit_message_flag`. Disabled by default.
+> - Feature flag `generate_commit_message_flag` [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158339) in GitLab 17.2.
+
+FLAG:
+The availability of this feature is controlled by a feature flag.
+For more information, see the history.
 
 When preparing to merge your merge request you might wish to edit the proposed merge commit message.
 
-- 
GitLab