Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

4 files changed, 31 insertions, 10 deletions

diff --git a/app/experiments/change_continuous_onboarding_link_urls_experiment.rb b/app/experiments/change_continuous_onboarding_link_urls_experiment.rb
deleted file mode 100644
index 680cb8eadd8..00000000000
--- a/app/experiments/change_continuous_onboarding_link_urls_experiment.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class ChangeContinuousOnboardingLinkUrlsExperiment < ApplicationExperiment # rubocop:disable Gitlab/NamespacedClass
-  attr_writer :namespace
-
-  def track(action, **event_args)
-    super(action, **event_args.merge(namespace: @namespace))
-  end
-end
diff --git a/app/experiments/new_project_sast_enabled_experiment.rb b/app/experiments/new_project_sast_enabled_experiment.rb
index b7b4552f0cc..a779b8ec633 100644
--- a/app/experiments/new_project_sast_enabled_experiment.rb
+++ b/app/experiments/new_project_sast_enabled_experiment.rb
@@ -15,4 +15,7 @@ class NewProjectSastEnabledExperiment < ApplicationExperiment # rubocop:disable
 
   def unchecked_candidate_behavior
   end
+
+  def unchecked_free_indicator_behavior
+  end
 end
diff --git a/app/experiments/require_verification_for_namespace_creation_experiment.rb b/app/experiments/require_verification_for_namespace_creation_experiment.rb
new file mode 100644
index 00000000000..1cadac7e7d4
--- /dev/null
+++ b/app/experiments/require_verification_for_namespace_creation_experiment.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class RequireVerificationForNamespaceCreationExperiment < ApplicationExperiment # rubocop:disable Gitlab/NamespacedClass
+  def control_behavior
+    false
+  end
+
+  def candidate_behavior
+    true
+  end
+
+  def candidate?
+    run
+  end
+
+  def record_conversion(namespace)
+    return unless should_track?
+
+    Experiment.by_name(name).record_conversion_event_for_subject(subject, namespace_id: namespace.id)
+  end
+
+  private
+
+  def subject
+    context.value[:user]
+  end
+end
diff --git a/app/experiments/templates/new_project_readme_content/readme_advanced.md.tt b/app/experiments/templates/new_project_readme_content/readme_advanced.md.tt
index 7592c7c6ab7..9b950ff49e4 100644
--- a/app/experiments/templates/new_project_readme_content/readme_advanced.md.tt
+++ b/app/experiments/templates/new_project_readme_content/readme_advanced.md.tt
@@ -47,7 +47,7 @@ Use the built-in continuous integration in GitLab.
 
 # Editing this README
 
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!).  Thank you to [makeareadme.com](<%= redirect("https://www.makeareadme.com/") %>) for this template.
+When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!).  Thank you to [makeareadme.com](https://www.makeareadme.com) for this template.
 
 ## Suggestions for a good README
 Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.