BigW Consortium Gitlab

Commit c71254ff by tiagonbotelho

creates the update_file method in repository.rb and applies changes accordingly

parent a01facc8
...@@ -749,15 +749,31 @@ class Repository ...@@ -749,15 +749,31 @@ class Repository
options[:author] = committer options[:author] = committer
options[:commit] = { options[:commit] = {
message: message, message: message,
<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
branch: ref branch: ref
} }
=======
branch: ref,
}
if previous_path
options[:file] = {
path: previous_path
}
Gitlab::Git::Blob.remove(raw_repository, options)
end
>>>>>>> creates the update_file method in repository.rb and applies changes accordingly
options[:file] = { options[:file] = {
content: content, content: content,
path: path, path: path,
update: update update: update
} }
<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
if previous_path if previous_path
options[:file].merge!(previous_path: previous_path) options[:file].merge!(previous_path: previous_path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment