summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-07-11 17:11:16 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-07-12 15:55:16 +0100
commitcf96c7596a80296abffe8ad75303cc964d72ee5d (patch)
tree009139c9c0222f3535b0d14a75a9a91a09cf828b /app/controllers/projects
parente167c94123fce673084cb641962c97e02d70bd91 (diff)
downloadgitlab-ce-cf96c7596a80296abffe8ad75303cc964d72ee5d.tar.gz
changes the usasge of path to file_path on blob_controller for compatibillity with the create action
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/blob_controller.rb8
1 files changed, 4 insertions, 4 deletions
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,