fixes merge request edit bug where it would generate a cloned file and not remove the previous one

2 files changed, 5 insertions, 6 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c800b2ec5b..e0c052fdc57 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,7 +398,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 e2ddda1474b..6d3a7fde101 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -38,16 +38,16 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def update
+    unless params[:file_name].empty?
+      @previous_path = @path
+      @path = params[:file_name]
+    end
+
     after_edit_path =
       if from_merge_request && @target_branch == @ref
         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