Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 18 deletions

diff --git a/config/feature_flags/development/eager_housekeeping_on_manual_jobs.yml b/config/feature_flags/development/eager_housekeeping_on_manual_jobs.yml
new file mode 100644
index 00000000000..640a4d5019f
--- /dev/null
+++ b/config/feature_flags/development/eager_housekeeping_on_manual_jobs.yml
@@ -0,0 +1,8 @@
+---
+name: eager_housekeeping_on_manual_jobs
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108970'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/388097'
+milestone: '15.9'
+type: development
+group: group::gitaly
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml b/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
deleted file mode 100644
index 398f3bddf8a..00000000000
--- a/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_for_help_continuous_onboarding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73846
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345708
-milestone: '14.5'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
deleted file mode 100644
index e047a4e9682..00000000000
--- a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: video_tutorials_continuous_onboarding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351916
-milestone: '14.9'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 4a2f8375249..ceb0671c034 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -92,8 +92,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        get :learn_gitlab, action: :index, controller: 'learn_gitlab'
-
         namespace :ci do
           resource :lint, only: [:show, :create]
           resource :pipeline_editor, only: [:show], controller: :pipeline_editor, path: 'editor'