tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
This commit is contained in:
Thibaut Girka
2018-10-09 21:08:26 +02:00
parent 269edc0e48 46e4a759bb
commit a02244f17c
7 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/core/settings.js
View File

@@ -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();

11
app/workers/scheduler/pghero_scheduler.rb Normal file
View File

@@ -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