Sutty/sutty
5
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

ay ay rubocop

Browse source
This commit is contained in:
f 2019-08-16 20:23:04 -03:00
parent da77ecf43f
commit 474d209d4a
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/site/repository.rb
View file

@ -44,11 +44,11 @@ class Site
return if merge.conflicts? return if merge.conflicts?
commit = Rugged::Commit commit = Rugged::Commit
.create(rugged, update_ref: 'HEAD', .create(rugged, update_ref: 'HEAD',
parents: [master, origin_master], parents: [master, origin_master],
tree: merge.write_tree(rugged), tree: merge.write_tree(rugged),
message: I18n.t('sites.fetch.merge.message'), message: I18n.t('sites.fetch.merge.message'),
author: author(usuarie), committer: committer) author: author(usuarie), committer: committer)
# Forzamos el checkout para mover el HEAD al último commit y # Forzamos el checkout para mover el HEAD al último commit y
# escribir los cambios # escribir los cambios