Add latest changes from gitlab-org/gitlab@master

app/models/ci/bridge.rb

@@ -7,7 +7,6 @@ module Ci
     include Importable
     include AfterCommitQueue
     include Ci::HasRef
-    extend ::Gitlab::Utils::Override
 
     InvalidBridgeTypeError = Class.new(StandardError)
     InvalidTransitionError = Class.new(StandardError)
@@ -200,13 +199,6 @@ module Ci
       end
     end
 
-    override :dependency_variables
-    def dependency_variables
-      return [] unless ::Feature.enabled?(:ci_bridge_dependency_variables, project, default_enabled: true)
-
-      super
-    end
-
     def target_revision_ref
       downstream_pipeline_params.dig(:target_revision, :ref)
     end

changelogs/unreleased/epic-5076-spec-controllers-runner_setup_controller_spec-rb.yml

@@ -0,0 +1,5 @@
+---
+title: Migrate runner_setup_controller_spec.rb to request spec
+merge_request: 50600
+author: Takuya Noguchi
+type: other

config/feature_flags/development/ci_bridge_dependency_variables.yml

@@ -1,7 +0,0 @@
----
-name: ci_bridge_dependency_variables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46530
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273734
-type: development
-group: group::pipeline authoring
-default_enabled: true

config/routes.rb

@@ -45,7 +45,12 @@ Rails.application.routes.draw do
 
   # Sign up
   scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
-    resource :welcome, only: [:show, :update], controller: 'welcome'
+    resource :welcome, only: [:show, :update], controller: 'welcome' do
+      Gitlab.ee do
+        get :trial_getting_started, on: :collection
+      end
+    end
+
     resource :experience_level, only: [:show, :update]
 
     Gitlab.ee do

lib/gitlab/experimentation.rb

@@ -99,6 +99,9 @@ module Gitlab
       },
       invite_members_new_dropdown: {
         tracking_category: 'Growth::Expansion::Experiment::InviteMembersNewDropdown'
+      },
+      trial_onboarding_issues: {
+        tracking_category: 'Growth::Conversion::Experiment::TrialOnboardingIssues'
       }
     }.freeze
 

locale/gitlab.pot

@@ -12995,6 +12995,9 @@ msgstr ""
 msgid "Get started"
 msgstr ""
 
+msgid "Get started with GitLab"
+msgstr ""
+
 msgid "Get started with a project that follows best practices for setting up GitLab for your own organization, including sample Issues, Merge Requests, and Milestones"
 msgstr ""
 
@@ -16304,6 +16307,9 @@ msgstr ""
 msgid "Learn GitLab"
 msgstr ""
 
+msgid "Learn GitLab - Gold trial"
+msgstr ""
+
 msgid "Learn how to %{link_start}contribute to the built-in templates%{link_end}"
 msgstr ""
 
@@ -19427,6 +19433,9 @@ msgstr ""
 msgid "Oh no!"
 msgstr ""
 
+msgid "Ok, let's go"
+msgstr ""
+
 msgid "Oldest first"
 msgstr ""
 
@@ -31169,6 +31178,9 @@ msgstr ""
 msgid "We couldn't reach the Prometheus server. Either the server no longer exists or the configuration details need updating."
 msgstr ""
 
+msgid "We created a sandbox project that will help you learn the basics of GitLab. You’ll be guided by issues in an issue board. You can go through the issues at your own pace."
+msgstr ""
+
 msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed."
 msgstr ""
 

spec/models/ci/bridge_spec.rb

@@ -356,14 +356,6 @@ RSpec.describe Ci::Bridge do
   describe '#dependency_variables' do
     subject { bridge.dependency_variables }
 
-    shared_context 'when ci_bridge_dependency_variables is disabled' do
-      before do
-        stub_feature_flags(ci_bridge_dependency_variables: false)
-      end
-
-      it { is_expected.to be_empty }
-    end
-
     context 'when downloading from previous stages' do
       let!(:prepare1) { create(:ci_build, name: 'prepare1', pipeline: pipeline, stage_idx: 0) }
       let!(:bridge) { create(:ci_bridge, pipeline: pipeline, stage_idx: 1) }
@@ -374,8 +366,6 @@ RSpec.describe Ci::Bridge do
       it 'inherits only dependent variables' do
         expect(subject.to_hash).to eq(job_variable_1.key => job_variable_1.value)
       end
-
-      it_behaves_like 'when ci_bridge_dependency_variables is disabled'
     end
 
     context 'when using needs' do
@@ -397,8 +387,6 @@ RSpec.describe Ci::Bridge do
       it 'inherits only needs with artifacts variables' do
         expect(subject.to_hash).to eq(job_variable_1.key => job_variable_1.value)
       end
-
-      it_behaves_like 'when ci_bridge_dependency_variables is disabled'
     end
   end
 end

spec/requests/runner_setup_controller_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe RunnerSetupController do
     sign_in(user)
   end
 
-  describe 'GET #platforms' do
+  describe 'GET /-/runner_setup/platforms' do
     it 'renders the platforms' do
-      get :platforms
+      get runner_setup_platforms_url
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to have_key("windows")