Gemfile

@@ -511,7 +511,7 @@ group :test do
 
   gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'webmock', '~> 3.21.2' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
   gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory

Gemfile.checksum

@@ -708,7 +708,7 @@
 {"name":"warning","version":"1.3.0","platform":"ruby","checksum":"23695a5d8e50bd5c46068931b529bee0b28e4982cbcefbe77d867800dde8069e"},
 {"name":"webauthn","version":"3.0.0","platform":"ruby","checksum":"3f77d422c2a8a4b31e56cf42f83414bd066e0506e9896936e1730262dc4a20e6"},
 {"name":"webfinger","version":"1.2.0","platform":"ruby","checksum":"7814ef1c85da47514f65c6e5ca14205fa9ce41ea2a70785e0c872842162852a2"},
-{"name":"webmock","version":"3.21.2","platform":"ruby","checksum":"dafd8f725bff4b880f338e2a8693e38ce776d635a0bc75450e053d9fdb00f66a"},
+{"name":"webmock","version":"3.22.0","platform":"ruby","checksum":"277f69335267f6b18d2d9bc8c287e60d4022b1e58a912c55e052a58d014e4b8e"},
 {"name":"webrick","version":"1.8.1","platform":"ruby","checksum":"19411ec6912911fd3df13559110127ea2badd0c035f7762873f58afc803e158f"},
 {"name":"websocket","version":"1.2.10","platform":"ruby","checksum":"2cc1a4a79b6e63637b326b4273e46adcddf7871caa5dc5711f2ca4061a629fa8"},
 {"name":"websocket-driver","version":"0.7.6","platform":"java","checksum":"bc894b9e9d5aee55ac04b61003e1957c4ef411a5a048199587d0499785b505c3"},

Gemfile.lock

@@ -1790,7 +1790,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.21.2)
+    webmock (3.22.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -2146,7 +2146,7 @@ DEPENDENCIES
   vmstat (~> 2.3.0)
   warning (~> 1.3.0)
   webauthn (~> 3.0)
-  webmock (~> 3.21.2)
+  webmock (~> 3.22.0)
   webrick (~> 1.8.1)
   wikicloth (= 0.8.1)
   yajl-ruby (~> 1.4.3)

app/models/namespace_setting.rb

@@ -6,7 +6,6 @@ class NamespaceSetting < ApplicationRecord
   include ChronicDurationAttribute
   include IgnorableColumns
 
-  ignore_column :project_import_level, remove_with: '16.10', remove_after: '2024-02-22'
   ignore_column :third_party_ai_features_enabled, remove_with: '16.10', remove_after: '2024-02-22'
   ignore_column %i[code suggestions delayed_project_removal lock_delayed_project_removal], remove_with: '16.10', remove_after: '2024-02-22'
 

ee/app/controllers/registrations/welcome_controller.rb

@@ -21,12 +21,6 @@ class WelcomeController < ApplicationController
     def show
       return redirect_to path_for_signed_in_user if completed_welcome_step?
 
-      # We to perform cookie migration for variant assignment from logged out to log in
-      # calling this in the controller layer gives us access to request where the
-      # signed cookie exist with the info we need for migration.
-      experiment(:free_trial_registration_redesign, actor: current_user).run
-      experiment(:free_trial_registration_redesign, actor: current_user).track(:show, label: 'welcome')
-
       track_event('render')
     end
 

ee/app/controllers/users/identity_verification_controller.rb

@@ -32,12 +32,6 @@ class IdentityVerificationController < ApplicationController
 
     def show
       push_frontend_feature_flag(:auto_request_phone_number_verification_exemption, @user, type: :gitlab_com_derisk)
-
-      # We to perform cookie migration for tracking from logged out to log in
-      # calling this before tracking gives us access to request where the
-      # signed cookie exist with the info we need for migration.
-      experiment(:free_trial_registration_redesign, actor: @user).run
-      experiment(:free_trial_registration_redesign, actor: @user).track(:show, label: 'identity_verification')
     end
 
     def verification_state

ee/app/experiments/free_trial_registration_redesign_experiment.rb

-# frozen_string_literal: true
-
-class FreeTrialRegistrationRedesignExperiment < ApplicationExperiment
-  control
-  variant(:candidate)
-
-  private
-
-  def control_behavior; end
-  def candidate_behavior; end
-end

ee/app/services/registrations/base_namespace_create_service.rb

@@ -20,10 +20,7 @@ def after_successful_group_creation(group_track_action:)
 
       experiment(:phone_verification_for_low_risk_users, user: user).track(:assignment, namespace: group)
 
-      if onboarding_status.trial?
-        experiment(:free_trial_registration_redesign, actor: user).track(:assignment, namespace: group)
-        experiment(:trial_discover_page, actor: user).track(:assignment, namespace: group)
-      end
+      experiment(:trial_discover_page, actor: user).track(:assignment, namespace: group) if onboarding_status.trial?
 
       apply_trial if onboarding_status.trial_onboarding_flow?
     end

ee/app/views/trial_registrations/_new.html.haml

-- content_for :omniauth_providers_top do
-  = render 'trial_registrations/signup_omniauth_provider_list'
-
-.row.gl-align-items-center
-  .col-lg-6.gl-display-none.gl-lg-display-flex.gl-flex-direction-column.gl-align-items-center.gl-justify-content-start
-    %div
-      = render 'shared/trial_reassurances'
-  .col-md-6.offset-md-3.offset-lg-0
-    %h2.gl-lg-display-none.gl-mb-3.gl-mt-0.gl-text-gray-800
-      = s_('InProductMarketing|Start your 30-day free trial')
-    %p.gl-lg-display-none.gl-font-lg.gl-text-gray-800
-      = s_('InProductMarketing|No credit card required')
-
-    .signup-page
-      = render 'devise/shared/signup_box',
-        borderless: true,
-        url: trial_registrations_path(glm_tracking_params),
-        button_text: _('Continue'),
-        show_omniauth_providers: social_signin_enabled?,
-        tracking_label: registration_tracking_label(trial: true)
-
-      = render 'devise/shared/sign_in_link'
-
-      %p.gl-text-center
-        = s_('InProductMarketing|Want to host GitLab on your servers?')
-        = link_to s_('InProductMarketing|Start a Self-Managed trial'),
-          'https://about.gitlab.com/free-trial/#selfmanaged/',
-          data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }

ee/app/views/trial_registrations/_new_design.html.haml

-- content_for :omniauth_providers_top do
-  .gl-pt-5.gl-max-w-75
-    %label.gl-font-weight-normal
-      = _('Sign up for your free trial with:')
-    .gl-display-flex.gl-gap-3
-      - popular_enabled_button_based_providers.each do |provider|
-        = render 'devise/shared/signup_omniauth_provider_button',
-          href: omniauth_authorize_path(:user, provider, register_omniauth_params(trial: true)),
-          provider: provider,
-          tracking_label: registration_tracking_label(trial: true)
-
-  .gl-my-5.gl-font-weight-bold.gl-max-w-75
-    = _('Or create your own GitLab account')
-
-.row.marketing-styling
-  .col-md-8.gl-display-flex.gl-flex-direction-column.gl-pl-120
-    %h1.gl-mt-0
-      - upper_tag = tag.span(class: 'gl-font-size-h2-xl')
-      - lower_tag = tag.span(class: 'gl-display-block')
-      = safe_format(s_('InProductMarketing|%{upper_start}Free 30-day trial%{upper_end} %{lower_start}GitLab Ultimate%{lower_end}'),
-        tag_pair(upper_tag, :upper_start, :upper_end),
-        tag_pair(lower_tag, :lower_start, :lower_end))
-
-    .signup-box
-      = render 'signup_box'
-
-      .additional-links.gl-mt-6.gl-font-weight-bold
-        = render 'devise/shared/sign_in_link', wrapper_class: ''
-
-        %p
-          = s_('InProductMarketing|Want to host GitLab on your servers?')
-          = link_to s_('InProductMarketing|Start a Self-Managed trial'),
-            'https://about.gitlab.com/free-trial/#selfmanaged/',
-            data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }
-
-  .col-md-4.gl-lg-display-flex.gl-flex-direction-column.gl-mb-6.gl-align-items-center.gl-pr-8
-    %div
-      - ultimate_trial_value_props = [s_('InProductMarketing|Accelerate your digital transformation'),
-      s_('InProductMarketing|Deliver software faster'),
-      s_('InProductMarketing|Ensure compliance'),
-      s_('InProductMarketing|Build in security'),
-      s_('InProductMarketing|Improve collaboration and visibility')]
-
-      %h2.gl-font-size-h2-xl.gl-font-weight-normal.gl-mb-6= s_('InProductMarketing|No credit card required.')
-
-      %ul.gl-pl-0.gl-mb-7.gl-pl-0.gl-text-gray-800.check-mark-text
-        - ultimate_trial_value_props.each do |value_prop|
-          %li.gl-display-flex.gl-mb-3
-            %span.gl-mr-3.text-brand-purple-02= sprite_icon 'check', css_class: 'gl-icon check-marks'
-            = value_prop
-
-      .gl-text-gray-800.gl-font-sm
-        = s_('InProductMarketing|Trusted by')
-
-      .gl-mt-5.gl-display-flex.gl-gap-6.gl-flex-wrap
-        - TrialRegistrationsHelper::TRUSTED_BY_LOGOS.each do |logo|
-          .gl-display-flex.gl-align-items-center
-            = image_tag(logo[:path], alt: logo[:alt], title: logo[:title], width: 100)

ee/app/views/trial_registrations/new.html.haml

@@ -9,10 +9,64 @@
   = render 'devise/shared/minimal_footer'
 
 = render "layouts/google_tag_manager_body"
+- @body_class = 'marketing-background-gradient'
+
+- content_for :omniauth_providers_top do
+  .gl-pt-5.gl-max-w-75
+    %label.gl-font-weight-normal
+      = _('Sign up for your free trial with:')
+    .gl-display-flex.gl-gap-3
+      - popular_enabled_button_based_providers.each do |provider|
+        = render 'devise/shared/signup_omniauth_provider_button',
+          href: omniauth_authorize_path(:user, provider, register_omniauth_params(trial: true)),
+          provider: provider,
+          tracking_label: registration_tracking_label(trial: true)
+
+  .gl-my-5.gl-font-weight-bold.gl-max-w-75
+    = _('Or create your own GitLab account')
+
+.row.marketing-styling
+  .col-md-8.gl-display-flex.gl-flex-direction-column.gl-pl-120
+    %h1.gl-mt-0
+      - upper_tag = tag.span(class: 'gl-font-size-h2-xl')
+      - lower_tag = tag.span(class: 'gl-display-block')
+      = safe_format(s_('InProductMarketing|%{upper_start}Free 30-day trial%{upper_end} %{lower_start}GitLab Ultimate%{lower_end}'),
+        tag_pair(upper_tag, :upper_start, :upper_end),
+        tag_pair(lower_tag, :lower_start, :lower_end))
+
+    .signup-box
+      = render 'signup_box'
+
+      .additional-links.gl-mt-6.gl-font-weight-bold
+        = render 'devise/shared/sign_in_link', wrapper_class: ''
+
+        %p
+          = s_('InProductMarketing|Want to host GitLab on your servers?')
+          = link_to s_('InProductMarketing|Start a Self-Managed trial'),
+            'https://about.gitlab.com/free-trial/#selfmanaged/',
+            data: { track_action: 'click_link', track_label: 'start_self-managed_trial' }
+
+  .col-md-4.gl-lg-display-flex.gl-flex-direction-column.gl-mb-6.gl-align-items-center.gl-pr-8
+    %div
+      - ultimate_trial_value_props = [s_('InProductMarketing|Accelerate your digital transformation'),
+      s_('InProductMarketing|Deliver software faster'),
+      s_('InProductMarketing|Ensure compliance'),
+      s_('InProductMarketing|Build in security'),
+      s_('InProductMarketing|Improve collaboration and visibility')]
+
+      %h2.gl-font-size-h2-xl.gl-font-weight-normal.gl-mb-6= s_('InProductMarketing|No credit card required.')
+
+      %ul.gl-pl-0.gl-mb-7.gl-pl-0.gl-text-gray-800.check-mark-text
+        - ultimate_trial_value_props.each do |value_prop|
+          %li.gl-display-flex.gl-mb-3
+            %span.gl-mr-3.text-brand-purple-02= sprite_icon 'check', css_class: 'gl-icon check-marks'
+            = value_prop
+
+      .gl-text-gray-800.gl-font-sm
+        = s_('InProductMarketing|Trusted by')
+
+      .gl-mt-5.gl-display-flex.gl-gap-6.gl-flex-wrap
+        - TrialRegistrationsHelper::TRUSTED_BY_LOGOS.each do |logo|
+          .gl-display-flex.gl-align-items-center
+            = image_tag(logo[:path], alt: logo[:alt], title: logo[:title], width: 100)
 
-- experiment(:free_trial_registration_redesign, actor: current_user) do |e|
-  - e.control do
-    = render 'new'
-  - e.candidate do
-    - @body_class = 'marketing-background-gradient'
-    = render 'new_design'

ee/config/feature_flags/experiment/free_trial_registration_redesign.yml

----
-name: free_trial_registration_redesign
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121269
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425215
-milestone: '16.6'
-type: experiment
-group: group::acquisition
-default_enabled: false

ee/spec/experiments/free_trial_registration_redesign_experiment_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe FreeTrialRegistrationRedesignExperiment, :experiment, feature_category: :acquisition do
-  context 'with candidate experience' do
-    before do
-      stub_experiments(free_trial_registration_redesign: :candidate)
-    end
-
-    it 'registers the behavior' do
-      expect(experiment(:free_trial_registration_redesign)).to register_behavior(:candidate).with(nil)
-      expect { experiment(:free_trial_registration_redesign).run }.not_to raise_error
-    end
-  end
-
-  context 'with control experience' do
-    before do
-      stub_experiments(free_trial_registration_redesign: :control)
-    end
-
-    it 'registers the behavior' do
-      expect(experiment(:free_trial_registration_redesign)).to register_behavior(:control).with(nil)
-      expect { experiment(:free_trial_registration_redesign).run }.not_to raise_error
-    end
-  end
-end

ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb

@@ -11,7 +11,7 @@
   end
 
   with_them do
-    it 'registers the user and creates a group and project reaching onboarding', :snowplow_micro, :sidekiq_inline do
+    it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
       sign_up_method.call(glm_params)
 
       ensure_onboarding { expect_to_see_welcome_form }
@@ -41,43 +41,6 @@
       click_on 'Ok, let\'s go'
 
       expect_to_be_in_learn_gitlab
-      expect(tracking_events_key).to have_all_expected_events
-    end
-
-    context 'with free_trial_registration_redesign experiment candidate' do
-      it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
-        stub_experiments(free_trial_registration_redesign: :candidate)
-
-        sign_up_method.call(glm_params)
-
-        ensure_onboarding { expect_to_see_welcome_form }
-
-        fills_in_welcome_form
-        click_on 'Continue'
-
-        ensure_onboarding { expect_to_see_company_form }
-
-        # failure
-        fill_in_company_form(success: false, trial: true)
-        click_on 'Continue'
-
-        expect_to_see_company_form_failure
-
-        # success
-        fill_in_company_form(success: true, trial: true)
-        click_on 'Continue'
-
-        ensure_onboarding { expect_to_see_group_and_project_creation_form }
-
-        fills_in_group_and_project_creation_form_with_trial
-        click_on 'Create project'
-
-        expect_to_be_in_continuous_onboarding
-
-        click_on 'Ok, let\'s go'
-
-        expect_to_be_in_learn_gitlab
-      end
     end
   end
 

ee/spec/services/registrations/standard_namespace_create_service_spec.rb

@@ -101,21 +101,6 @@
         expect(execute).to be_success
       end
 
-      context 'with free_trial_registration_redesign experiment not called' do
-        subject(:service) { described_class.new(user, params) }
-
-        before do
-          stub_saas_features(onboarding: true)
-        end
-
-        it 'does not call the experiment DSL' do
-          allow(service).to receive(:experiment).and_call_original
-          expect(service).not_to receive(:experiment).with(:free_trial_registration_redesign, actor: user)
-
-          expect(service.execute).to be_success
-        end
-      end
-
       context 'with trial_discover_page experiment not called' do
         subject(:service) { described_class.new(user, params) }
 
@@ -261,21 +246,6 @@
         end
       end
 
-      context 'with free_trial_registration_redesign experiment called' do
-        subject(:service) { described_class.new(user, params) }
-
-        before do
-          stub_saas_features(onboarding: true)
-        end
-
-        it 'tracks experiment assignment event' do
-          allow(service).to receive(:experiment).and_call_original
-          expect(service).to receive(:experiment).with(:free_trial_registration_redesign, actor: user)
-
-          expect(service.execute).to be_success
-        end
-      end
-
       context 'with trial_discover_page experiment called' do
         subject(:service) { described_class.new(user, params) }
 

ee/spec/support/helpers/saas_registration_helpers.rb

@@ -264,7 +264,7 @@ def expect_to_see_import_form
   end
 
   def expect_to_be_on_trial_user_registration
-    expect(page).to have_content('Start your 30-day free trial')
+    expect(page).to have_content('Free 30-day trial')
   end
 
   def expect_to_be_on_user_sign_in

ee/spec/views/trial_registrations/new.html.haml_spec.rb

@@ -14,30 +14,11 @@
 
   subject { render && rendered }
 
-  context 'when free_trial_registration_redesign is control' do
-    before do
-      stub_experiments(free_trial_registration_redesign: :control)
-    end
+  it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
+  it { is_expected.to have_content(s_('InProductMarketing|Free 30-day trial')) }
+  it { is_expected.to have_content(s_('InProductMarketing|GitLab Ultimate')) }
+  it { is_expected.to have_content(s_('InProductMarketing|No credit card required.')) }
 
-    it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
-    it { is_expected.to have_content(s_('InProductMarketing|Start your 30-day free trial')) }
-    it { is_expected.to have_content(s_('InProductMarketing|No credit card required')) }
-
-    it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
-    it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
-  end
-
-  context 'when free_trial_registration_redesign is candidate' do
-    before do
-      stub_experiments(free_trial_registration_redesign: :candidate)
-    end
-
-    it { is_expected.not_to have_content(_('Start a Free Ultimate Trial')) }
-    it { is_expected.to have_content(s_('InProductMarketing|Free 30-day trial')) }
-    it { is_expected.to have_content(s_('InProductMarketing|GitLab Ultimate')) }
-    it { is_expected.to have_content(s_('InProductMarketing|No credit card required.')) }
-
-    it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
-    it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
-  end
+  it { is_expected.to have_content(s_('InProductMarketing|Want to host GitLab on your servers?')) }
+  it { is_expected.to have_link(s_('InProductMarketing|Start a Self-Managed trial'), href: 'https://about.gitlab.com/free-trial/#selfmanaged/') }
 end

gems/gitlab-housekeeper/lib/gitlab/housekeeper/change.rb

@@ -9,7 +9,8 @@ class Change
         :changed_files,
         :labels,
         :keep_class,
-        :changelog_type
+        :changelog_type,
+        :mr_web_url
       attr_reader :reviewers
 
       def initialize

gems/gitlab-housekeeper/lib/gitlab/housekeeper/git.rb

@@ -11,44 +11,51 @@ def initialize(logger:, branch_from: 'master')
         @branch_from = branch_from
       end
 
-      def commit_in_branch(change)
+      def with_clean_state
+        result = Shell.execute('git', 'stash')
+        stashed = !result.include?('No local changes to save')
+
+        with_return_to_current_branch(stashed: stashed) do
+          checkout_branch(@branch_from)
+
+          yield
+        end
+      end
+
+      def create_branch(change)
         branch_name = branch_name(change.identifiers)
 
-        create_commit(branch_name, change)
+        Shell.execute("git", "branch", "-f", branch_name)
 
         branch_name
       end
 
-      def with_branch_from_branch
-        stashed = false
-        current_branch = Shell.execute('git', 'branch', '--show-current').chomp
-
-        result = Shell.execute('git', 'stash')
-        stashed = !result.include?('No local changes to save')
+      def in_branch(branch_name)
+        with_return_to_current_branch do
+          checkout_branch(branch_name)
 
-        Shell.execute("git", "checkout", @branch_from)
+          yield
+        end
+      end
 
-        yield
-      ensure
-        # The `current_branch` won't be set in CI due to how the repo is cloned. Therefore we should only checkout
-        # `current_branch` if we actually have one.
-        Shell.execute("git", "checkout", current_branch) if current_branch.present?
-        Shell.execute('git', 'stash', 'pop') if stashed
+      def create_commit(change)
+        Shell.execute("git", "add", *change.changed_files)
+        Shell.execute("git", "commit", "-m", change.commit_message)
       end
 
-      def create_commit(branch_name, change)
-        current_branch = Shell.execute('git', 'branch', '--show-current').chomp
+      private
 
+      def create_and_checkout_branch(branch_name)
         begin
           Shell.execute("git", "branch", '-D', branch_name)
         rescue Shell::Error # Might not exist yet
         end
 
         Shell.execute("git", "checkout", "-b", branch_name)
-        Shell.execute("git", "add", *change.changed_files)
-        Shell.execute("git", "commit", "-m", change.commit_message)
-      ensure
-        Shell.execute("git", "checkout", current_branch)
+      end
+
+      def checkout_branch(branch_name)
+        Shell.execute("git", "checkout", branch_name)
       end
 
       def branch_name(identifiers)
@@ -66,6 +73,17 @@ def branch_name(identifiers)
 
         branch_name
       end
+
+      def with_return_to_current_branch(stashed: false)
+        current_branch = Shell.execute('git', 'branch', '--show-current').chomp
+
+        yield
+      ensure
+        # The `current_branch` won't be set in CI due to how the repo is cloned. Therefore we should only checkout
+        # `current_branch` if we actually have one.
+        checkout_branch(current_branch) if current_branch.present?
+        Shell.execute('git', 'stash', 'pop') if stashed
+      end
     end
   end
 end

gems/gitlab-housekeeper/lib/gitlab/housekeeper/gitlab_client.rb

@@ -23,16 +23,19 @@ def non_housekeeper_changes(
         target_project_id:
       )
 
-        iid = get_existing_merge_request(
+        existing_merge_request = get_existing_merge_request(
           source_project_id: source_project_id,
           source_branch: source_branch,
           target_branch: target_branch,
           target_project_id: target_project_id
         )
 
-        return [] if iid.nil?
+        return [] if existing_merge_request.nil?
 
-        merge_request_notes = get_merge_request_notes(target_project_id: target_project_id, iid: iid)
+        merge_request_notes = get_merge_request_notes(
+          target_project_id: target_project_id,
+          iid: existing_merge_request['iid']
+        )
 
         changes = Set.new
 
@@ -48,7 +51,10 @@ def non_housekeeper_changes(
           changes << :reviewers if note['body'].include?('removed review request for')
         end
 
-        resource_label_events = get_merge_request_resource_label_events(target_project_id: target_project_id, iid: iid)
+        resource_label_events = get_merge_request_resource_label_events(
+          target_project_id: target_project_id,
+          iid: existing_merge_request['iid']
+        )
 
         resource_label_events.each do |event|
           next if event["user"]["id"] == current_user_id
@@ -76,17 +82,17 @@ def create_or_update_merge_request(
         update_labels:,
         update_reviewers:
       )
-        existing_iid = get_existing_merge_request(
+        existing_merge_request = get_existing_merge_request(
           source_project_id: source_project_id,
           source_branch: source_branch,
           target_branch: target_branch,
           target_project_id: target_project_id
         )
 
-        if existing_iid
+        if existing_merge_request
           update_existing_merge_request(
             change: change,
-            existing_iid: existing_iid,
+            existing_iid: existing_merge_request['iid'],
             target_project_id: target_project_id,
             update_title: update_title,
             update_description: update_description,
@@ -105,6 +111,21 @@ def create_or_update_merge_request(
       end
       # rubocop:enable Metrics/ParameterLists
 
+      def get_existing_merge_request(source_project_id:, source_branch:, target_branch:, target_project_id:)
+        data = request(:get, "/projects/#{target_project_id}/merge_requests", query: {
+          state: :opened,
+          source_branch: source_branch,
+          target_branch: target_branch,
+          source_project_id: source_project_id
+        })
+
+        return nil if data.empty?
+
+        raise Error, "More than one matching MR exists: iids: #{data.pluck('iid').join(',')}" unless data.size == 1
+
+        data.first
+      end
+
       private
 
       def get_merge_request_notes(target_project_id:, iid:)
@@ -120,23 +141,6 @@ def current_user_id
         @current_user_id ||= request(:get, "/user")['id']
       end
 
-      def get_existing_merge_request(source_project_id:, source_branch:, target_branch:, target_project_id:)
-        data = request(:get, "/projects/#{target_project_id}/merge_requests", query: {
-          state: :opened,
-          source_branch: source_branch,
-          target_branch: target_branch,
-          source_project_id: source_project_id
-        })
-
-        return nil if data.empty?
-
-        iids = data.pluck('iid')
-
-        raise Error, "More than one matching MR exists: iids: #{iids.join(',')}" unless data.size == 1
-
-        iids.first
-      end
-
       def create_merge_request(
         change:,
         source_project_id:,