Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-19 05:36:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-12980' of https://0xacab.org/sutty/sutty into 17.3.alpine.panel.sutty.nl

Browse source
This commit is contained in:
Sutty 2023-09-27 19:52:24 +00:00
commit b1a582cbd0
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/jobs/git_pull_job.rb
View file

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