From 8947942cb9066f2775faf4b0864e2874a1c39907 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 27 Jul 2023 16:46:32 -0300
Subject: [PATCH] fix: commit message fixed #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 9 ++++++---
 app/jobs/git_pull_job.rb                      | 4 ++--
 app/models/site/repository.rb                 | 2 +-
 config/locales/en.yml                         | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 4811d792..40187915 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -4,11 +4,14 @@ module Api
     module V1
       # Recibe webhooks y lanza jobs
       class WebhooksController < BaseController
+        # Trae los cambios a partir de un post de Webhooks:
+        # (Gitlab, Github, Guitea, etc)
         def pull 
-          # encontrar el sitio
-          site = Site.find_by_name(params[:site_id])
+          site = Site.find_by_name!(params[:site_id])
           usuarie = GitAuthor.new email: "webhook@#{Site.domain}", name: 'Webhook'
-          message = I18n.t('webhooks.pull.message')
+          message = I18n.with_locale(site.default_locale) do
+            I18n.t('webhooks.pull.message')
+          end
 
           GitPullJob.perform_later(site, usuarie, message)
         end
diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index de263403..5cd86981 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -6,8 +6,8 @@ class GitPullJob < ApplicationJob
     # @param :site [Site]
     # @param :usuarie [Usuarie]
     # @return [nil]
-    def perform(site, usuarie)
+    def perform(site, usuarie, message)
       site.repository.fetch
-      site.repository.merge(usuarie)
+      site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
     end
 end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index a3487bc5..a864e8b9 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -56,7 +56,7 @@ class Site
     # Incorpora los cambios en el repositorio actual
     #
     # @return [Rugged::Commit]
-    def merge(usuarie, message)
+    def merge(usuarie, message= I18n.t('sites.fetch.merge.message'))
       merge = rugged.merge_commits(head_commit, remote_head_commit)
 
       # No hacemos nada si hay conflictos, pero notificarnos
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 05fcf1e5..8ae8cce5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -468,7 +468,7 @@ en:
         message: 'Skeleton upgrade'
   webhooks_controller:
     pull:
-      message: 'Webhooks upgrade'
+      message: 'Webhooks pull'
   footer:
     powered_by: 'is developed by'
   i18n: