Skip to content

Commit 96eaf6d

Browse files
author
root
committed
Fix #551
1 parent 3865a67 commit 96eaf6d

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Diff for: lib/redmine_git_hosting/config/redmine_config.rb

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ def gitolite_use_sidekiq?
88
end
99

1010

11+
def sidekiq_available?
12+
@sidekiq_available ||=
13+
begin
14+
require 'sidekiq'
15+
rescue LoadError
16+
false
17+
else
18+
true
19+
end
20+
end
21+
22+
1123
def hierarchical_organisation?
1224
get_setting(:hierarchical_organisation, true)
1325
end

Diff for: lib/redmine_git_hosting/gitolite_accessor.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ def resync_gitolite(command, object, options = {})
139139
bypass = false
140140
end
141141

142-
if RedmineGitHosting::Config.gitolite_use_sidekiq? && !bypass
142+
if RedmineGitHosting::Config.gitolite_use_sidekiq? &&
143+
RedmineGitHosting::Config.sidekiq_available? && !bypass
143144
GithostingShellWorker.maybe_do(command, object, options)
144145
else
145146
GitoliteWrapper.resync_gitolite(command, object, options)

0 commit comments

Comments
 (0)