diff options
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd3..84b4a30c6d5 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ module CreatesCommit commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index bcd436f2429..116f184c240 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ class Projects::BlobController < Projects::ApplicationController "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, |