From f6a4346585dcc6cc564cb4974a0ea49d2ac0531d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 3 Apr 2023 09:10:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/blob_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/projects/blob_controller.rb') diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index ab1ac0beb36..a5d18af993d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -100,6 +100,7 @@ class Projects::BlobController < Projects::ApplicationController ) rescue Files::UpdateService::FileChangedError @conflict = true + @different_project = different_project? render :edit end -- cgit v1.2.1