From 4deab9a5406cadcdb16870f81dea1a6f41787af3 Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Wed, 6 Jul 2016 18:36:22 +0100
Subject: [PATCH] fixes merge request edit bug where it would generate a cloned
file and not remove the previous one
---
Gemfile.lock | 1 -
app/controllers/projects/blob_controller.rb | 5 -----
2 files changed, 6 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index a86612509ae..efd15fa1d93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -409,7 +409,6 @@ GEM
mail_room (0.8.0)
method_source (0.8.2)
mime-types (2.99.2)
- mime-types-data (3.2016.0521)
mimemagic (0.3.1)
mini_portile2 (2.1.0)
minitest (5.7.0)
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 8fc24668b42..091b661a09f 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -48,11 +48,6 @@ class Projects::BlobController < Projects::ApplicationController
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"#file-path-#{hexdigest(@path)}"
else
- unless params[:file_name].empty?
- @previous_path = @path
- @path = params[:file_name]
- end
-
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
end
--
GitLab