From 298abfd3b488c9c783ea59ef57e769da009af125 Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Fri, 1 Jul 2016 17:46:37 +0100
Subject: [PATCH] successfully adds the new version with the updated name on
the projects repo
---
app/controllers/concerns/creates_commit.rb | 3 ++-
app/controllers/projects/blob_controller.rb | 6 +++++-
app/services/files/base_service.rb | 1 +
3 files changed, 8 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,
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index 37c5e321b39..ac5d7ddde02 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -15,6 +15,7 @@ module Files
params[:file_content]
end
+ # Validate parameters
validate
# Create new branch if it different from source_branch
--
GitLab