Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-17 23:46:22 +00:00
Code Issues Projects Releases Wiki Activity

fix: add documentation to pull job #13903
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse source
This commit is contained in:
jazzari 2023-07-27 17:02:48 -03:00
parent 8947942cb9
commit 9f5364a738
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/git_pull_job.rb
View file

@ -5,9 +5,9 @@
class GitPullJob < ApplicationJob class GitPullJob < ApplicationJob
# @param :site [Site] # @param :site [Site]
# @param :usuarie [Usuarie] # @param :usuarie [Usuarie]
# @param :message [String]
# @return [nil] # @return [nil]
def perform(site, usuarie, message) def perform(site, usuarie, message)
site.repository.fetch
site.repository.merge(usuarie, message) if site.repository.fetch&.positive? site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
end end
end end

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

@ -56,7 +56,7 @@ class Site
# Incorpora los cambios en el repositorio actual # Incorpora los cambios en el repositorio actual
# #
# @return [Rugged::Commit] # @return [Rugged::Commit]
def merge(usuarie, message= I18n.t('sites.fetch.merge.message')) def merge(usuarie, message = I18n.t('sites.fetch.merge.message'))
merge = rugged.merge_commits(head_commit, remote_head_commit) merge = rugged.merge_commits(head_commit, remote_head_commit)
# No hacemos nada si hay conflictos, pero notificarnos # No hacemos nada si hay conflictos, pero notificarnos