Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
This commit is contained in:
commit
f1fa6b3cd0
25 files changed
+211
-148
No files matched your search
@@ -14,10 +14,8 @@ module Mastodon
|
||||
obj = {
|
||||
type: 'web',
|
||||
queue_time: queue_time,
|
||||
default_labels: default_labels(env, result),
|
||||
default_labels: {},
|
||||
}
|
||||
labels = custom_labels(env)
|
||||
obj = obj.merge(custom_labels: labels) if labels
|
||||
|
||||
@client.send_json(obj)
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user