diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 18:36:22 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 15:42:19 +0100 |
| commit | fc747dc34627c4bcb9fbb0ecab1440224f23ec88 (patch) | |
| tree | b21a3435c99ce4ba13fd86aa83743b106249c03b /app/controllers/projects/blob_controller.rb | |
| parent | 6a3d05a94bd5c1c821a588232e5b96b5581a0c3e (diff) | |
| download | gitlab-ce-fc747dc34627c4bcb9fbb0ecab1440224f23ec88.tar.gz | |
fixes merge request edit bug where it would generate a cloned file and not remove the previous one
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4d8bb5be20b..00549265e9e 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) + |