fixes issues for mr acceptance

908eabeb · tiagonbotelho · d652fa56 · 908eabeb
Commit 908eabeb authored Jul 06, 2016 by tiagonbotelho
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/repository.rb app/models/repository.rb +2 -2

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -748,8 +748,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