diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-13 11:19:14 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-13 11:19:14 +0100 |
| commit | dd3addad481e7e0475cfecd16c8bcd3dc65e967d (patch) | |
| tree | a7382b0dd412b50eba516b7fe945e65b6e6b7d32 | |
| parent | 4352ff0d446337b8718e9164d7fdac08fcc53d6f (diff) | |
| download | gitlab-ce-dd3addad481e7e0475cfecd16c8bcd3dc65e967d.tar.gz | |
renames :file_name to :file_path
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 0120ad8e058..eda3727a28d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,9 +38,9 @@ class Projects::BlobController < Projects::ApplicationController end def update - unless params[:file_name].nil? || params[:file_name].empty? + if params[:file_path].present? @previous_path = @path - @path = params[:file_name] + @path = params[:file_path] @commit_params[:file_path] = @path end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ad3009f30ab..ff379bafb26 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,8 +5,8 @@ = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] || @path), - class: 'form-control new-file-name' + = text_field_tag 'file_path', (params[:file_path] || @path), + class: 'form-control new-file-path' - if current_action?(:new) || current_action?(:create) %span.editor-file-name |