Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 8 deletions

diff --git a/config/feature_flags/development/ai_chat_prompt_alternative.yml b/config/feature_flags/development/ai_chat_prompt_alternative.yml
deleted file mode 100644
index f568abcec24..00000000000
--- a/config/feature_flags/development/ai_chat_prompt_alternative.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ai_chat_prompt_alternative
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125092
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417230
-milestone: '16.2'
-type: development
-group: group::ai-enablement
-default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 7968d46dad4..bbdbd68a78b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1276,6 +1276,12 @@ production: &base
     # Default is '.gitlab_suggested_reviewers_secret' relative to Rails.root (i.e. root of the GitLab app).
     # secret_file: /home/git/gitlab/.gitlab_suggested_reviewers_secret
 
+  zoekt:
+    # Files that contain username and password for basic auth for Zoekt
+    # Default is '.gitlab_zoekt_username' and '.gitlab_zoekt_password' in Rails.root
+    # username_file: /home/git/gitlab/.gitlab_zoekt_username
+    # password_file: /home/git/gitlab/.gitlab_zoekt_password
+
   ## GitLab Elasticsearch settings
   elasticsearch:
     indexer_path: /home/git/gitlab-elasticsearch-indexer/
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index cda625fab13..6c7561ffb89 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -927,6 +927,15 @@ Gitlab.ee do
 end
 
 #
+# Zoekt credentials
+#
+Gitlab.ee do
+  Settings['zoekt'] ||= {}
+  Settings.zoekt['username_file'] ||= Rails.root.join('.gitlab_zoekt_username')
+  Settings.zoekt['password_file'] ||= Rails.root.join('.gitlab_zoekt_password')
+end
+
+#
 # Repositories
 #
 Settings['repositories'] ||= {}