From 7694fa139ad9753c1541895752c9808f8bf50303 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 21 Oct 2025 11:23:19 +0100 Subject: [PATCH] Show merge request page when target branch is missing Updates the merge request page to be shown when the target branch is missing and the source branch has no commits. https://gitlab.com/gitlab-org/gitlab/-/issues/533881 --- app/controllers/projects/merge_requests_controller.rb | 3 --- spec/controllers/projects/merge_requests_controller_spec.rb | 1 + .../shared_examples/requests/user_activity_shared_examples.rb | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 83549d208816d0..ee17959800d67f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -419,9 +419,6 @@ def show_merge_request respond_to do |format| format.html do - # use next to appease Rubocop - next render('invalid') if target_branch_missing? - render_html_page end diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index b9684f31052447..8627369a30b69e 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -234,6 +234,7 @@ def go(extra_params = {}) go(format: :html) expect(response).to be_successful + expect(response).not_to render_template('projects/merge_requests/invalid') end end diff --git a/spec/support/shared_examples/requests/user_activity_shared_examples.rb b/spec/support/shared_examples/requests/user_activity_shared_examples.rb index 323f42c8435872..133a8c3ef5af96 100644 --- a/spec/support/shared_examples/requests/user_activity_shared_examples.rb +++ b/spec/support/shared_examples/requests/user_activity_shared_examples.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true RSpec.shared_examples 'updating of user activity' do |paths_to_visit| - let(:user) { create(:user, last_activity_on: nil) } + let(:user) { create(:user, :with_namespace, last_activity_on: nil) } before do group = create(:group, name: 'group') -- GitLab