From 474d209d4acce82e9a985f853d5c88e2f56fcb60 Mon Sep 17 00:00:00 2001 From: f Date: Fri, 16 Aug 2019 20:23:04 -0300 Subject: [PATCH] ay ay rubocop --- app/models/site/repository.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb index 0204bd3e..825cc84a 100644 --- a/app/models/site/repository.rb +++ b/app/models/site/repository.rb @@ -44,11 +44,11 @@ class Site return if merge.conflicts? commit = Rugged::Commit - .create(rugged, update_ref: 'HEAD', - parents: [master, origin_master], - tree: merge.write_tree(rugged), - message: I18n.t('sites.fetch.merge.message'), - author: author(usuarie), committer: committer) + .create(rugged, update_ref: 'HEAD', + parents: [master, origin_master], + tree: merge.write_tree(rugged), + message: I18n.t('sites.fetch.merge.message'), + author: author(usuarie), committer: committer) # Forzamos el checkout para mover el HEAD al último commit y # escribir los cambios