From 8840dcf679bf40c70e2fb0f1d6823b8138d3fe20 Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Wed, 6 Jul 2016 13:51:28 +0100
Subject: [PATCH] fixes issues for mr acceptance
---
app/models/repository.rb | 2 +-
app/views/projects/blob/_editor.html.haml | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 38ef1b2c57b..ea7355b3c08 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -760,7 +760,7 @@ class Repository
}
if options[:previous_path]
- commit_options[:file].merge!(previous_path: 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
--
GitLab