mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-26 09:56:21 +00:00
Merge branch 'rails' into issue-7537
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
commit
1d3325deaa
1 changed files with 11 additions and 8 deletions
|
@ -5,9 +5,12 @@
|
|||
class GitPullJob < ApplicationJob
|
||||
# @param :site [Site]
|
||||
# @param :usuarie [Usuarie]
|
||||
# @param :message [String]
|
||||
# @return [nil]
|
||||
def perform(site, usuarie, message)
|
||||
site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
|
||||
def perform(site, usuarie)
|
||||
return unless site.repository.origin
|
||||
return unless site.repository.fetch.positive?
|
||||
|
||||
site.repository.merge(usuarie)
|
||||
site.reindex_changes!
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue