IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' of https://github.com/discourse/discourse"

Browse Source 
This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.
This commit is contained in:
Jeff Atwood
2020-05-22 20:25:56 -07:00
parent e62a85cf6f
commit 20780a1eee
236 changed files with 717 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/badge_granter.rb
View File

@@ -3,11 +3,11 @@
class BadgeGranter
def self.disable_queue
@queue_disabled = true
@queue_enabled = false
end
def self.enable_queue
@queue_disabled = false
@queue_enabled = true
end
def initialize(badge, user, opts = {})
@@ -124,7 +124,7 @@ class BadgeGranter
end
def self.queue_badge_grant(type, opt)
return if !SiteSetting.enable_badges || @queue_disabled
return if !SiteSetting.enable_badges || !@queue_enabled
payload = nil
case type