From 59a2e17994da6988023758b572f82789af3f90dd Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Wed, 6 Jul 2016 18:51:02 +0100
Subject: fixes more issues for MR acceptance

---
 app/models/repository.rb                  | 24 ++++++++++++------------
 app/services/files/update_service.rb      |  5 +++--
 app/views/projects/blob/_editor.html.haml |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index ea7355b3c08..1aba6ec17b4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -742,29 +742,29 @@ class Repository
   end
 
   # previous_path, message, update
-  def update_file(user, path, content, branch, options={})
+  def update_file(user, path, content, branch:, previous_path:, message:)
     commit_with_hooks(user, branch) do |ref|
       committer = user_to_committer(user)
-      commit_options = {}
-      commit_options[:committer] = committer
-      commit_options[:author] = committer
-      commit_options[:commit] = {
-        message: options[:message],
+      options = {}
+      options[:committer] = committer
+      options[:author] = committer
+      options[:commit] = {
+        message: message,
         branch: ref
       }
 
-      commit_options[:file] = {
+      options[:file] = {
         content: content,
         path: path,
-        update: options[:update]
+        update: true
       }
 
-      if options[:previous_path]
-        commit_options[:file][:previous_path] = options[:previous_path]
+      if previous_path
+        options[:file][:previous_path] = previous_path
 
-        Gitlab::Git::Blob.rename(raw_repository, commit_options)
+        Gitlab::Git::Blob.rename(raw_repository, options)
       else
-        Gitlab::Git::Blob.commit(raw_repository, commit_options)
+        Gitlab::Git::Blob.commit(raw_repository, options)
       end
     end
   end
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 905c7a7c81a..8d2b5083179 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -4,8 +4,9 @@ module Files
   class UpdateService < Files::BaseService
     def commit
       repository.update_file(current_user, @file_path, @file_content,
-                             @target_branch, previous_path: @previous_path,
-                             message: @commit_message, update: true)
+                             branch: @target_branch,
+                             previous_path: @previous_path,
+                             message: @commit_message)
     end
   end
 end
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 31bd4646d3d..ad3009f30ab 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -4,8 +4,8 @@
       = icon('code-fork')
       = ref
     %span.editor-file-name
-      -if current_action?(:edit) || current_action?(:update)
-        = text_field_tag 'file_name', (params[:file_name] or @path),
+      - if current_action?(:edit) || current_action?(:update)
+        = text_field_tag 'file_name', (params[:file_name] || @path),
                                       class: 'form-control new-file-name'
 
     - if current_action?(:new) || current_action?(:create)
-- 
cgit v1.2.1