diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-03 09:10:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-03 09:10:48 +0000 |
| commit | f6a4346585dcc6cc564cb4974a0ea49d2ac0531d (patch) | |
| tree | 9e9109c2442dbac93c7a38d60c093b56be9e0fa4 /app/controllers/projects/blob_controller.rb | |
| parent | bdfa808bfa4983d67a1ff54e4a3b7070be4d13eb (diff) | |
| download | gitlab-ce-f6a4346585dcc6cc564cb4974a0ea49d2ac0531d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |