diff --git a/Gemfile.lock b/Gemfile.lock index 03dcc3abdec33056413509189223537da62880a9..b87b288f71f6023999d8cb0922c38f3e41f787e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -432,7 +432,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 4d8bb5be20bb544d7822983f8c3fe566e0fbc5a6..00549265e9e7fb86fa4546843ec905e12017438b 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,6 +38,11 @@ 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) +