diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-09 21:08:26 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-09 21:08:26 +0200 |
commit | a02244f17c841f641c9ed289fb592b73fecf472d (patch) | |
tree | 39a682cbdd9307bd437f6cbf4eda3430cac87bc6 /app | |
parent | 269edc0e48886ea90455283f08a646c86387cfbc (diff) | |
parent | 46e4a759bbe0e78fdbb4c1573a404bd4b531315a (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/core/settings.js | 2 | ||||
-rw-r--r-- | app/workers/scheduler/pghero_scheduler.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/javascript/core/settings.js b/app/javascript/core/settings.js index 377c899dc..af97c84f9 100644 --- a/app/javascript/core/settings.js +++ b/app/javascript/core/settings.js @@ -56,7 +56,7 @@ delegate(document, '.input-copy input', 'click', ({ target }) => { }); delegate(document, '.input-copy button', 'click', ({ target }) => { - const input = target.parentNode.querySelector('input'); + const input = target.parentNode.querySelector('.input-copy__wrapper input'); input.focus(); input.select(); diff --git a/app/workers/scheduler/pghero_scheduler.rb b/app/workers/scheduler/pghero_scheduler.rb new file mode 100644 index 000000000..4453bf2cd --- /dev/null +++ b/app/workers/scheduler/pghero_scheduler.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class Scheduler::PgheroScheduler + include Sidekiq::Worker + + sidekiq_options unique: :until_executed, retry: 0 + + def perform + PgHero.capture_space_stats + end +end |