diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 13:51:28 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 14:24:35 +0100 |
| commit | 510558fbb8b736c0903059bd19f2f095024cabd0 (patch) | |
| tree | 1d7dbddc14d58e3e656fce35e0d8ae8c989e2201 | |
| parent | 8df419cba35262b827b6d04870da1df3ed79b939 (diff) | |
| download | gitlab-ce-510558fbb8b736c0903059bd19f2f095024cabd0.tar.gz | |
fixes issues for mr acceptance
| -rw-r--r-- | app/models/repository.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 58ceed6aa3d..ea7355b3c08 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -759,8 +759,8 @@ class Repository update: options[:update] } - if commit_options[:previous_path] - commit_options[:file].merge!(previous_path: commit_options[:previous_path]) + if options[:previous_path] + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 3c64b2f5e96..31bd4646d3d 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,11 +4,9 @@ = icon('code-fork') = ref %span.editor-file-name - - if current_action?(:edit) && can?(current_user, :push_code, @project) - = text_field_tag 'file_name', params[:file_name], placeholder: @path, + -if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - else - = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name |