From cf96c7596a80296abffe8ad75303cc964d72ee5d Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Mon, 11 Jul 2016 17:11:16 +0100
Subject: [PATCH] changes the usasge of path to file_path on blob_controller
for compatibillity with the create action
---
app/controllers/concerns/creates_commit.rb | 2 +-
app/controllers/projects/blob_controller.rb | 8 ++++----
app/views/projects/blob/_editor.html.haml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 036805306f2..a76fcd61b52 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -8,7 +8,7 @@ module CreatesCommit
source_project: @project,
source_branch: @ref,
target_branch: @target_branch,
- file_path: @path,
+ file_path: @file_path,
previous_path: @previous_path
)
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 091b661a09f..fb6ddd0e51d 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -39,16 +39,16 @@ class Projects::BlobController < Projects::ApplicationController
def update
unless params[:file_name].empty?
- @previous_path = @path
- @path = params[:file_name]
+ @previous_path = @file_path
+ @file_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)}"
+ "#file-path-#{hexdigest(@file_path)}"
else
- namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
+ namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path))
end
create_commit(Files::UpdateService, success_path: after_edit_path,
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 8a22e912624..e920f35879f 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -5,7 +5,7 @@
= ref
%span.editor-file-name
- if current_action?(:edit) || current_action?(:update)
- = text_field_tag 'file_name', (params[:file_name] || @path),
+ = text_field_tag 'file_name', (params[:file_name] || @file_path),
class: 'form-control new-file-name'
- if current_action?(:new) || current_action?(:create)
%span.editor-file-name
--
GitLab