gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit 'e95e896f10' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-16 17:52:40 +09:00
commit 5759c6628f
14 changed files with 142 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/rack_attack.rb
View file

@ -145,7 +145,7 @@ class Rack::Attack
'Content-Type' => 'application/json',
'X-RateLimit-Limit' => match_data[:limit].to_s,
'X-RateLimit-Remaining' => '0',
'X-RateLimit-Reset' => (now + (match_data[:period] - now.to_i % match_data[:period])).iso8601(6),
'X-RateLimit-Reset' => (now + (match_data[:period] - (now.to_i % match_data[:period]))).iso8601(6),
}
[429, headers, [{ error: I18n.t('errors.429') }.to_json]]

4
config/webpack/generateLocalePacks.js
View file

@ -5,7 +5,7 @@
const fs = require('fs');
const path = require('path');
const rimraf = require('rimraf');
const mkdirp = require('mkdirp');
const { mkdirp } = require('mkdirp');
const localesJsonPath = path.join(__dirname, '../../app/javascript/mastodon/locales');
const locales = fs.readdirSync(localesJsonPath).filter(filename => {
@ -48,5 +48,3 @@ setLocale({messages, localeData});
});
module.exports = outPaths;