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

Merge commit '730bb3e211' into kb_development

Browse source
This commit is contained in:
KMY 2023-02-25 11:14:35 +09:00
commit de3512fb82
74 changed files with 34 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

37
.rubocop_todo.yml
View file

@ -73,7 +73,7 @@ Lint/EmptyBlock:
- 'spec/fabricators/setting_fabricator.rb'
- 'spec/fabricators/system_key_fabricator.rb'
- 'spec/fabricators/web_setting_fabricator.rb'
- 'spec/helpers/admin/action_log_helper_spec.rb'
- 'spec/helpers/admin/action_logs_helper_spec.rb'
- 'spec/lib/activitypub/adapter_spec.rb'
- 'spec/models/account_alias_spec.rb'
- 'spec/models/account_deletion_request_spec.rb'
@ -557,8 +557,8 @@ RSpec/DescribedClass:
- 'spec/presenters/account_relationships_presenter_spec.rb'
- 'spec/presenters/instance_presenter_spec.rb'
- 'spec/presenters/status_relationships_presenter_spec.rb'
- 'spec/serializers/activitypub/note_spec.rb'
- 'spec/serializers/activitypub/update_poll_spec.rb'
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/serializers/rest/account_serializer_spec.rb'
- 'spec/services/activitypub/fetch_remote_account_service_spec.rb'
- 'spec/services/activitypub/fetch_remote_actor_service_spec.rb'
@ -579,7 +579,7 @@ RSpec/DescribedClass:
- 'spec/services/purge_domain_service_spec.rb'
- 'spec/services/reblog_service_spec.rb'
- 'spec/services/reject_follow_service_spec.rb'
- 'spec/services/remove_from_follwers_service_spec.rb'
- 'spec/services/remove_from_followers_service_spec.rb'
- 'spec/services/remove_status_service_spec.rb'
- 'spec/services/unallow_domain_service_spec.rb'
- 'spec/services/unblock_service_spec.rb'
@ -592,7 +592,7 @@ RSpec/DescribedClass:
# This cop supports unsafe autocorrection (--autocorrect-all).
RSpec/EmptyExampleGroup:
Exclude:
- 'spec/helpers/admin/action_log_helper_spec.rb'
- 'spec/helpers/admin/action_logs_helper_spec.rb'
- 'spec/models/account_alias_spec.rb'
- 'spec/models/account_deletion_request_spec.rb'
- 'spec/models/account_moderation_note_spec.rb'
@ -698,8 +698,8 @@ RSpec/FilePath:
- 'spec/lib/activitypub/tag_manager_spec.rb'
- 'spec/lib/ostatus/tag_manager_spec.rb'
- 'spec/lib/sanitize_config_spec.rb'
- 'spec/serializers/activitypub/note_spec.rb'
- 'spec/serializers/activitypub/update_poll_spec.rb'
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
- 'spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb'
- 'spec/services/activitypub/fetch_remote_account_service_spec.rb'
@ -733,8 +733,8 @@ RSpec/HookArgument:
- 'spec/helpers/instance_helper_spec.rb'
- 'spec/models/user_spec.rb'
- 'spec/rails_helper.rb'
- 'spec/serializers/activitypub/note_spec.rb'
- 'spec/serializers/activitypub/update_poll_spec.rb'
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/services/import_service_spec.rb'
- 'spec/spec_helper.rb'
@ -755,8 +755,8 @@ RSpec/InstanceVariable:
- 'spec/models/concerns/account_interactions_spec.rb'
- 'spec/models/concerns/remotable_spec.rb'
- 'spec/models/public_feed_spec.rb'
- 'spec/serializers/activitypub/note_spec.rb'
- 'spec/serializers/activitypub/update_poll_spec.rb'
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/services/remove_status_service_spec.rb'
- 'spec/services/search_service_spec.rb'
- 'spec/services/unblock_domain_service_spec.rb'
@ -864,7 +864,7 @@ RSpec/MissingExampleGroupArgument:
- 'spec/controllers/accounts_controller_spec.rb'
- 'spec/controllers/activitypub/collections_controller_spec.rb'
- 'spec/controllers/admin/statuses_controller_spec.rb'
- 'spec/controllers/admin/users/roles_controller.rb'
- 'spec/controllers/admin/users/roles_controller_spec.rb'
- 'spec/controllers/api/v1/accounts_controller_spec.rb'
- 'spec/controllers/api/v1/admin/account_actions_controller_spec.rb'
- 'spec/controllers/api/v1/admin/domain_allows_controller_spec.rb'
@ -1022,8 +1022,8 @@ RSpec/NamedSubject:
- 'spec/policies/tag_policy_spec.rb'
- 'spec/policies/user_policy_spec.rb'
- 'spec/presenters/familiar_followers_presenter_spec.rb'
- 'spec/serializers/activitypub/note_spec.rb'
- 'spec/serializers/activitypub/update_poll_spec.rb'
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/serializers/rest/account_serializer_spec.rb'
- 'spec/services/account_search_service_spec.rb'
- 'spec/services/account_statuses_cleanup_service_spec.rb'
@ -1060,7 +1060,7 @@ RSpec/NamedSubject:
- 'spec/services/purge_domain_service_spec.rb'
- 'spec/services/reblog_service_spec.rb'
- 'spec/services/reject_follow_service_spec.rb'
- 'spec/services/remove_from_follwers_service_spec.rb'
- 'spec/services/remove_from_followers_service_spec.rb'
- 'spec/services/remove_status_service_spec.rb'
- 'spec/services/report_service_spec.rb'
- 'spec/services/resolve_account_service_spec.rb'
@ -1149,7 +1149,7 @@ RSpec/Rails/InferredSpecType:
- 'spec/controllers/admin/accounts_controller_spec.rb'
- 'spec/controllers/admin/action_logs_controller_spec.rb'
- 'spec/controllers/admin/base_controller_spec.rb'
- 'spec/controllers/admin/change_email_controller_spec.rb'
- 'spec/controllers/admin/change_emails_controller_spec.rb'
- 'spec/controllers/admin/confirmations_controller_spec.rb'
- 'spec/controllers/admin/dashboard_controller_spec.rb'
- 'spec/controllers/admin/disputes/appeals_controller_spec.rb'
@ -1235,7 +1235,7 @@ RSpec/Rails/InferredSpecType:
- 'spec/controllers/well_known/webfinger_controller_spec.rb'
- 'spec/helpers/accounts_helper_spec.rb'
- 'spec/helpers/admin/account_moderation_notes_helper_spec.rb'
- 'spec/helpers/admin/action_log_helper_spec.rb'
- 'spec/helpers/admin/action_logs_helper_spec.rb'
- 'spec/helpers/flashes_helper_spec.rb'
- 'spec/helpers/formatting_helper_spec.rb'
- 'spec/helpers/home_helper_spec.rb'
@ -1398,7 +1398,7 @@ RSpec/SubjectStub:
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
RSpec/VerifiedDoubles:
Exclude:
- 'spec/controllers/admin/change_email_controller_spec.rb'
- 'spec/controllers/admin/change_emails_controller_spec.rb'
- 'spec/controllers/admin/confirmations_controller_spec.rb'
- 'spec/controllers/admin/disputes/appeals_controller_spec.rb'
- 'spec/controllers/admin/domain_allows_controller_spec.rb'
@ -2113,7 +2113,6 @@ Style/MutableConstant:
- 'app/services/delete_account_service.rb'
- 'app/services/fetch_link_card_service.rb'
- 'app/services/resolve_url_service.rb'
- 'app/validators/html_validator.rb'
- 'lib/mastodon/snowflake.rb'
- 'spec/controllers/api/base_controller_spec.rb'

3
app/javascript/mastodon/features/status/components/card.jsx
View file

@ -196,11 +196,12 @@ export default class Card extends React.PureComponent {
const interactive = card.get('type') !== 'link';
const className = classnames('status-card', { horizontal, compact, interactive });
const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
const language = card.get('language') || '';
const ratio = card.get('width') / card.get('height');
const height = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
const description = (
<div className='status-card__content'>
<div className='status-card__content' lang={language}>
{title}
{!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
<span className='status-card__host'>{provider}</span>

4
app/javascript/styles/mastodon-light/diff.scss
View file

@ -258,6 +258,10 @@ html {
border-color: $ui-base-color;
}
.upload-progress__backdrop {
background: $ui-base-color;
}
// Change the background colors of statuses
.focusable:focus {
background: $ui-base-color;

2
app/javascript/styles/mastodon/components.scss
View file

@ -4576,7 +4576,7 @@ a.status-card.compact:hover {
width: 100%;
height: 6px;
border-radius: 6px;
background: $ui-base-lighter-color;
background: darken($simple-background-color, 8%);
position: relative;
margin-top: 5px;
}

2
app/serializers/rest/preview_card_serializer.rb
View file

@ -3,7 +3,7 @@
class REST::PreviewCardSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :url, :title, :description, :type,
attributes :url, :title, :description, :language, :type,
:author_name, :author_url, :provider_name,
:provider_url, :html, :width, :height,
:image, :embed_url, :blurhash

20
app/validators/html_validator.rb
View file

@ -1,20 +0,0 @@
# frozen_string_literal: true
class HtmlValidator < ActiveModel::EachValidator
ERROR_RE = /Opening and ending tag mismatch|Unexpected end tag/
def validate_each(record, attribute, value)
return if value.blank?
errors = html_errors(value)
record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s)) unless errors.empty?
end
private
def html_errors(str)
fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str)
fragment.errors.select { |error| ERROR_RE.match?(error.message) }
end
end

24
app/workers/scheduler/accounts_statuses_cleanup_scheduler.rb
View file

@ -7,7 +7,7 @@ class Scheduler::AccountsStatusesCleanupScheduler
# This limit is mostly to be nice to the fediverse at large and not
# generate too much traffic.
# This also helps limiting the running time of the scheduler itself.
MAX_BUDGET = 50
MAX_BUDGET = 150
# This is an attempt to spread the load across instances, as various
# accounts are likely to have various followers.
@ -15,28 +15,22 @@ class Scheduler::AccountsStatusesCleanupScheduler
# This is an attempt to limit the workload generated by status removal
# jobs to something the particular instance can handle.
PER_THREAD_BUDGET = 5
PER_THREAD_BUDGET = 6
# Those avoid loading an instance that is already under load
MAX_DEFAULT_SIZE = 2
MAX_DEFAULT_SIZE = 200
MAX_DEFAULT_LATENCY = 5
MAX_PUSH_SIZE = 5
MAX_PUSH_SIZE = 500
MAX_PUSH_LATENCY = 10
# 'pull' queue has lower priority jobs, and it's unlikely that pushing
# deletes would cause much issues with this queue if it didn't cause issues
# with default and push. Yet, do not enqueue deletes if the instance is
# lagging behind too much.
MAX_PULL_SIZE = 500
MAX_PULL_LATENCY = 300
MAX_PULL_SIZE = 10_000
MAX_PULL_LATENCY = 5.minutes.to_i
# This is less of an issue in general, but deleting old statuses is likely
# to cause delivery errors, and thus increase the number of jobs to be retried.
# This doesn't directly translate to load, but connection errors and a high
# number of dead instances may lead to this spiraling out of control if
# unchecked.
MAX_RETRY_SIZE = 50_000
sidekiq_options retry: 0, lock: :until_executed
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
def perform
return if under_load?
@ -73,8 +67,6 @@ class Scheduler::AccountsStatusesCleanupScheduler
end
def under_load?
return true if Sidekiq::Stats.new.retry_size > MAX_RETRY_SIZE
queue_under_load?('default', MAX_DEFAULT_SIZE, MAX_DEFAULT_LATENCY) || queue_under_load?('push', MAX_PUSH_SIZE, MAX_PUSH_LATENCY) || queue_under_load?('pull', MAX_PULL_SIZE, MAX_PULL_LATENCY)
end

2
config/locales/an.yml
View file

@ -1183,8 +1183,6 @@ an:
validation_errors:
one: Bella cosa no ye bien! Per favor, revisa la error
other: Bella cosa no ye bien! Per favor, revise %{count} errors mas abaixo
html_validator:
invalid_markup: 'contiene codigo HTML no valido: %{error}'
imports:
errors:
invalid_csv_file: 'Fichero CSV no valido. Error: %{error}'

2
config/locales/ar.yml
View file

@ -1217,8 +1217,6 @@ ar:
other: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
two: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
zero: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
html_validator:
invalid_markup: 'يحتوي على علامة HTML غير صالحة: %{error}'
imports:
errors:
invalid_csv_file: 'ملف CSV غير صالح. خطأ: %{error}'

2
config/locales/be.yml
View file

@ -1270,8 +1270,6 @@ be:
many: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
one: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце памылку ніжэй
other: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
html_validator:
invalid_markup: 'змяшчае несапраўдную разметку HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Несапраўдны файл CSV. Памылка: %{error}'

2
config/locales/bg.yml
View file

@ -1215,8 +1215,6 @@ bg:
validation_errors:
one: Нещо още не е напълно наред! Прегледайте грешката долу
other: Нещо още не е напълно наред! Прегледайте %{count} грешки долу
html_validator:
invalid_markup: 'съдържа невалидно HTML маркиране: %{error}'
imports:
errors:
invalid_csv_file: 'Невалиден файл CSV. Грешка: %{error}'

2
config/locales/ca.yml
View file

@ -1220,8 +1220,6 @@ ca:
validation_errors:
one: Alguna cosa no va bé! Si us plau, revisa l'error
other: Alguna cosa no va bé! Si us plau, revisa %{count} errors més a baix
html_validator:
invalid_markup: 'conté HTML markup no vàlid: %{error}'
imports:
errors:
invalid_csv_file: 'Fitxer CSV invàlid. Error: %{error}'

2
config/locales/ckb.yml
View file

@ -756,8 +756,6 @@ ckb:
validation_errors:
one: شتێک هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەکەی خوارەوە بخشێنەوە
other: هێشتا تەواو ڕاست نیە تکایە چاو بە هەڵەی %{count} خوارەوە بخشێنەوە
html_validator:
invalid_markup: 'نیشانەی HTML نادروستی تێدایە: %{error}'
imports:
modes:
merge: یەکخستن

2
config/locales/co.yml
View file

@ -716,8 +716,6 @@ co:
validation_errors:
one: Qualcosa ùn và bè! Verificate u prublemu quì sottu
other: Qualcosa ùn và bè! Verificate %{count} prublemi quì sottu
html_validator:
invalid_markup: 'cuntene codice HTML invalidu: %{error}'
imports:
errors:
over_rows_processing_limit: cuntene più di %{count} filari

2
config/locales/cs.yml
View file

@ -1245,8 +1245,6 @@ cs:
many: Něco ještě není úplně v pořádku! Zkontrolujte prosím %{count} chyb uvedených níže
one: Něco ještě není úplně v pořádku! Zkontrolujte prosím chybu uvedenou níže
other: Něco ještě není úplně v pořádku! Zkontrolujte prosím %{count} chyb uvedených níže
html_validator:
invalid_markup: 'obsahuje neplatný HTML kód: %{error}'
imports:
errors:
invalid_csv_file: 'Neplatný soubor CSV. Chyba: %{error}'

2
config/locales/cy.yml
View file

@ -1320,8 +1320,6 @@ cy:
other: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod, os gwelwch yn dda
two: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} wall isod, os gwelwch yn dda
zero: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
html_validator:
invalid_markup: 'yn cynnwys markup HTML annilys: %{error}'
imports:
errors:
invalid_csv_file: 'Ffeil CSV annilys. Gwall: %{error}'

2
config/locales/da.yml
View file

@ -1216,8 +1216,6 @@ da:
validation_errors:
one: Noget er ikke er helt i vinkel! Tjek fejlen nedenfor
other: Noget er ikke er helt i vinkel! Tjek de %{count} fejl nedenfor
html_validator:
invalid_markup: 'indeholder ugyldig HTML-markup: %{error}'
imports:
errors:
invalid_csv_file: 'Ugyldig CSV-fil. Fejl: %{error}'

2
config/locales/de.yml
View file

@ -1220,8 +1220,6 @@ de:
validation_errors:
one: Etwas ist noch nicht ganz richtig! Bitte korrigiere den Fehler
other: Etwas ist noch nicht ganz richtig! Bitte korrigiere %{count} Fehler
html_validator:
invalid_markup: 'enthält ungültiges HTML-Markup: %{error}'
imports:
errors:
invalid_csv_file: 'Ungültige CSV-Datei. Fehler: %{error}'

2
config/locales/el.yml
View file

@ -857,8 +857,6 @@ el:
validation_errors:
one: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε το παρακάτω σφάλμα
other: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε τα παρακάτω %{count} σφάλματα
html_validator:
invalid_markup: 'περιέχει λάθος μορφοποίηση HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Μη έγκυρο αρχείο CSV. Σφάλμα: %{error}'

2
config/locales/en.yml
View file

@ -1220,8 +1220,6 @@ en:
validation_errors:
one: Something isn't quite right yet! Please review the error below
other: Something isn't quite right yet! Please review %{count} errors below
html_validator:
invalid_markup: 'contains invalid HTML markup: %{error}'
imports:
errors:
invalid_csv_file: 'Invalid CSV file. Error: %{error}'

2
config/locales/eo.yml
View file

@ -1221,8 +1221,6 @@ eo:
validation_errors:
one: Io mise okazis! Bonvolu konsulti la suban erar-raporton
other: Io mise okazis! Bonvolu konsulti la subajn %{count} erar-raportojn
html_validator:
invalid_markup: 'havas nevalidan HTML-markadon: %{error}'
imports:
errors:
invalid_csv_file: Nevalida CSV-dosiero. %{error}

2
config/locales/es-AR.yml
View file

@ -1220,8 +1220,6 @@ es-AR:
validation_errors:
one: "¡Falta algo! Por favor, revisá el error abajo"
other: "¡Falta algo! Por favor, revisá los %{count} errores abajo"
html_validator:
invalid_markup: 'contiene markup HTML no válido: %{error}'
imports:
errors:
invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'

2
config/locales/es-MX.yml
View file

@ -1207,8 +1207,6 @@ es-MX:
validation_errors:
one: "¡Algo no está bien! Por favor, revisa el error"
other: "¡Algo no está bien! Por favor, revise %{count} errores más abajo"
html_validator:
invalid_markup: 'contiene código HTML no válido: %{error}'
imports:
errors:
invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'

2
config/locales/es.yml
View file

@ -1220,8 +1220,6 @@ es:
validation_errors:
one: "¡Algo no está bien! Por favor, revisa el error"
other: "¡Algo no está bien! Por favor, revise %{count} errores más abajo"
html_validator:
invalid_markup: 'contiene código HTML no válido: %{error}'
imports:
errors:
invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'

2
config/locales/et.yml
View file

@ -1220,8 +1220,6 @@ et:
validation_errors:
one: Midagi pole ikka õigesti! Palun vaata allolev veateade üle
other: Midagi pole ikka õigesti! Palun vaata all olevad %{count} veateadet üle
html_validator:
invalid_markup: 'sisaldab valet HTMLi süntaksi: %{error}'
imports:
errors:
invalid_csv_file: 'Vigane CSV-fail. Tõrge: %{error}'

2
config/locales/eu.yml
View file

@ -1222,8 +1222,6 @@ eu:
validation_errors:
one: Zerbait ez dabil ongi! Egiaztatu beheko errorea mesedez
other: Zerbait ez dabil ongi! Egiaztatu beheko %{count} erroreak mesedez
html_validator:
invalid_markup: 'HTML markaketa baliogabea du: %{error}'
imports:
errors:
invalid_csv_file: 'CSV fitxategi baliogabea. Errorea: %{error}'

2
config/locales/fa.yml
View file

@ -904,8 +904,6 @@ fa:
validation_errors:
one: یک چیزی هنوز درست نیست! لطفاً خطاهای زیر را ببینید
other: یک چیزی هنوز درست نیست! لطفاً %{count} خطای زیر را ببینید
html_validator:
invalid_markup: 'دارای نشانه‌گذاری نامعتبر HTML است: %{error}'
imports:
errors:
over_rows_processing_limit: دارای بیش از %{count} ردیف

2
config/locales/fi.yml
View file

@ -1220,8 +1220,6 @@ fi:
validation_errors:
one: Kaikki ei ole aivan oikein! Tarkasta alla oleva virhe
other: Kaikki ei ole aivan oikein! Tarkasta alla olevat %{count} virhettä
html_validator:
invalid_markup: 'sisältää virheellisen HTML-merkinnän: %{error}'
imports:
errors:
invalid_csv_file: 'Epäkelpo CSV-tiedosto. Virhe: %{error}'

2
config/locales/fo.yml
View file

@ -1220,8 +1220,6 @@ fo:
validation_errors:
one: Okkurt er ikki heilt rætt enn! Vinarliga eftirhygg feilin niðanfyri
other: Okkurt er ikki heilt rætt enn! Vinarliga eftirhygg teir %{count} feilirnar niðanfyri
html_validator:
invalid_markup: 'inniheldur ógyldugt HTML markup: %{error}'
imports:
errors:
invalid_csv_file: 'Ógildug CSV-fíla. Error: %{error}'

2
config/locales/fr-QC.yml
View file

@ -1216,8 +1216,6 @@ fr-QC:
validation_errors:
one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
html_validator:
invalid_markup: 'contient un balisage HTML invalide: %{error}'
imports:
errors:
invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'

2
config/locales/fr.yml
View file

@ -1220,8 +1220,6 @@ fr:
validation_errors:
one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
html_validator:
invalid_markup: 'contient un balisage HTML invalide: %{error}'
imports:
errors:
invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'

2
config/locales/fy.yml
View file

@ -1220,8 +1220,6 @@ fy:
validation_errors:
one: Der is wat net hielendal goed! Besjoch ûndersteande flater
other: Der is wat net hielendal goed! Besjoch ûndersteande %{count} flaters
html_validator:
invalid_markup: 'befettet ûnjildige HTML-opmaak: %{error}'
imports:
errors:
invalid_csv_file: 'Unjildich CSV-bestân. Flater: %{error}'

2
config/locales/gd.yml
View file

@ -1257,8 +1257,6 @@ gd:
one: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air an %{count} mhearachd gu h-ìosal
other: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air an %{count} mearachd gu h-ìosal
two: Tha rud ann nach eil buileach ceart fhathast! Thoir sùil air an %{count} mhearachd gu h-ìosal
html_validator:
invalid_markup: 'tha HTML markup mì-dhligheach ann: %{error}'
imports:
errors:
invalid_csv_file: 'Faidhle CSV mì-dhligheach. Mearachd: %{error}'

2
config/locales/gl.yml
View file

@ -1220,8 +1220,6 @@ gl:
validation_errors:
one: Algo non está ben de todo! Por favor revise abaixo o erro
other: Algo aínda non está ben! Por favor revise os %{count} erros abaixo
html_validator:
invalid_markup: 'contén cancelos HTML non válidas: %{error}'
imports:
errors:
invalid_csv_file: 'Ficheiro CSV non válido. Erro: %{error}'

2
config/locales/he.yml
View file

@ -1270,8 +1270,6 @@ he:
one: משהו עדיין לא בסדר! נא לעיין בשגיאה להלן
other: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
two: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
html_validator:
invalid_markup: 'מכיל קוד HTML לא תקין: %{error}'
imports:
errors:
invalid_csv_file: 'קובץ CSV שבור. שגיאה: %{error}'

2
config/locales/hu.yml
View file

@ -1220,8 +1220,6 @@ hu:
validation_errors:
one: Valami nincs rendjén! Tekintsd meg a hibát lent
other: Valami nincs rendjén! Tekintsd meg a(z) %{count} hibát lent
html_validator:
invalid_markup: 'hibás HTML leíró: %{error}'
imports:
errors:
invalid_csv_file: 'Érvénytelen CSV-fájl. Hiba: %{error}'

2
config/locales/id.yml
View file

@ -1153,8 +1153,6 @@ id:
today: hari ini
validation_errors:
other: Ada yang belum benar! Silakan tinjau %{count} kesalahan di bawah ini
html_validator:
invalid_markup: 'berisi markup HTML yang tidak valid: %{error}'
imports:
errors:
invalid_csv_file: 'Berkas CVS tidak sah. Kesalahan: %{error}'

2
config/locales/io.yml
View file

@ -1136,8 +1136,6 @@ io:
validation_errors:
one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto
other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti
html_validator:
invalid_markup: 'kontenas nevalida kompozuro di HTML: %{error}'
imports:
errors:
over_rows_processing_limit: kontenas plu kam %{count} horizontala lineo

2
config/locales/is.yml
View file

@ -1220,8 +1220,6 @@ is:
validation_errors:
one: Ennþá er ekk alvegi allt í lagi! Skoðaðu vel villuna hér fyrir neðan
other: Ennþá er ekki alveg allt í lagi! Skoðaðu vel villurnar %{count} hér fyrir neðan
html_validator:
invalid_markup: 'inniheldur ógildar HTML-merkingar: %{error}'
imports:
errors:
invalid_csv_file: 'Ógild CSV-skrá. Villa: %{error}'

2
config/locales/it.yml
View file

@ -1222,8 +1222,6 @@ it:
validation_errors:
one: Qualcosa ancora non va bene! Per favore, controlla l'errore qui sotto
other: Qualcosa ancora non va bene! Per favore, controlla i %{count} errori qui sotto
html_validator:
invalid_markup: 'contiene markup HTML non valido: %{error}'
imports:
errors:
invalid_csv_file: 'File CSV non valido. Errore: %{error}'

2
config/locales/ja.yml
View file

@ -1195,8 +1195,6 @@ ja:
today: 今日
validation_errors:
other: エラーが発生しました！ 以下の%{count}件のエラーを確認してください
html_validator:
invalid_markup: '無効なHTMLマークアップが含まれています: %{error}'
imports:
errors:
invalid_csv_file: '無効なCSVファイルです。エラー: %{error}'

2
config/locales/kk.yml
View file

@ -481,8 +481,6 @@ kk:
validation_errors:
one: Бір нәрсе дұрыс емес! Төмендегі қатені қараңыз
other: Бір нәрсе дұрыс емес! Төмендегі %{count} қатені қараңыз
html_validator:
invalid_markup: 'жарамсыз HTML код: %{error}'
imports:
modes:
merge: Біріктіру

2
config/locales/ko.yml
View file

@ -1197,8 +1197,6 @@ ko:
today: 오늘
validation_errors:
other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오
html_validator:
invalid_markup: '올바르지 않은 HTML 마크업을 포함하고 있습니다: %{error}'
imports:
errors:
invalid_csv_file: '올바르지 않은 CSV 파일입니다. 오류: %{error}'

2
config/locales/ku.yml
View file

@ -1180,8 +1180,6 @@ ku:
validation_errors:
one: Tiştek hîn ne rast e! Ji kerema xwe çewtiya li jêr di ber çavan re derbas bike
other: Tiştek hîn ne rast e! Ji kerema xwe %{count} çewtî li jêr di ber çavan re derbas bike
html_validator:
invalid_markup: 'di nav de nîşana HTML a nederbasdar heye: %{error}'
imports:
errors:
invalid_csv_file: 'Pelê CSV nederbasdar e. Çewtî: %{error}'

2
config/locales/lv.yml
View file

@ -1245,8 +1245,6 @@ lv:
one: Kaut kas vēl nav īsti kārtībā! Lūdzu, pārskati zemāk norādīto kļūdu
other: Kaut kas vēl nav īsti kārtībā! Lūdzu, pārskati %{count} kļūdas zemāk
zero: "%{count} kļūdu"
html_validator:
invalid_markup: 'satur nederīgu HTML marķējumu: %{error}'
imports:
errors:
invalid_csv_file: 'Nederīgs CSV fails. Kļūda: %{error}'

2
config/locales/nl.yml
View file

@ -1220,8 +1220,6 @@ nl:
validation_errors:
one: Er is iets niet helemaal goed! Bekijk onderstaande fout
other: Er is iets niet helemaal goed! Bekijk onderstaande %{count} fouten
html_validator:
invalid_markup: 'bevat ongeldige HTML-opmaak: %{error}'
imports:
errors:
invalid_csv_file: 'Ongeldig CSV-bestand. Fout: %{error}'

2
config/locales/nn.yml
View file

@ -1163,8 +1163,6 @@ nn:
validation_errors:
one: Noe er ikke helt riktig ennå. Vennligst se etter en gang til
other: Noe er ikke helt riktig ennå. Det er ennå %{count} feil å rette på
html_validator:
invalid_markup: 'rommar ugild HTML-kode: %{error}'
imports:
errors:
invalid_csv_file: 'Ugyldig CSV-fil. Feil: %{error}'

2
config/locales/no.yml
View file

@ -1155,8 +1155,6 @@
validation_errors:
one: Noe er ikke helt riktig ennå. Vennligst se etter en gang til
other: Noe er ikke helt riktig ennå. Det er ennå %{count} feil å rette på
html_validator:
invalid_markup: 'inneholder ugyldig HTML-markør: %{error}'
imports:
errors:
invalid_csv_file: 'Ugyldig CSV-fil. Feil: %{error}'

2
config/locales/oc.yml
View file

@ -640,8 +640,6 @@ oc:
validation_errors:
one: I a quicòm que truca ! Mercés de corregir l’error çai-jos
other: I a quicòm que truca ! Mercés de corregir las %{count} errors çai-jos
html_validator:
invalid_markup: 'conten un balisatge HTML invalid : %{error}'
imports:
modes:
merge: Fondre

2
config/locales/pl.yml
View file

@ -1270,8 +1270,6 @@ pl:
many: Coś jest wciąż nie tak! Przejrzyj %{count} poniższych błędów
one: Coś jest wciąż nie tak! Przyjrzyj się poniższemu błędowi
other: Coś jest wciąż nie tak! Przejrzyj poniższe błędy (%{count})
html_validator:
invalid_markup: 'zawiera nieprawidłową składnię HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Nieprawidłowy plik CSV. Błąd: %{error}'

2
config/locales/pt-BR.yml
View file

@ -1195,8 +1195,6 @@ pt-BR:
validation_errors:
one: Algo não está certo! Analise o erro abaixo
other: Algo não está certo! Analise os %{count} erros abaixo
html_validator:
invalid_markup: 'contém HTML inválido: %{error}'
imports:
errors:
invalid_csv_file: 'Arquivo CSV inválido. Erro: %{error}'

2
config/locales/pt-PT.yml
View file

@ -1218,8 +1218,6 @@ pt-PT:
validation_errors:
one: Algo não está correcto. Por favor analise o erro abaixo
other: Algo não está bem. Queira analisar os %{count} erros abaixo
html_validator:
invalid_markup: 'contém marcação HTML inválida: %{error}'
imports:
errors:
invalid_csv_file: 'Arquivo CSV inválido. Erro: %{error}'

2
config/locales/ru.yml
View file

@ -1247,8 +1247,6 @@ ru:
many: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
one: Что-то здесь не так! Пожалуйста, прочитайте об ошибке ниже
other: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
html_validator:
invalid_markup: 'невалидная разметка HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Неверный файл CSV. Ошибка: %{error}'

2
config/locales/sc.yml
View file

@ -670,8 +670,6 @@ sc:
validation_errors:
one: Calicuna cosa ancora no est andende. Bide sa faddina in bàsciu
other: Calicuna cosa ancora no est andende. Bide is %{count} faddinas in bàsciu
html_validator:
invalid_markup: 'cuntenet etichetas HTML non vàlidas: %{error}'
imports:
errors:
over_rows_processing_limit: cuntenet prus de %{count} filas

2
config/locales/sco.yml
View file

@ -1170,8 +1170,6 @@ sco:
validation_errors:
one: Somethin isnae quite richt yit! Please luik ower the error ablow
other: Somethin isnae quite richt yit! Please review %{count} errors ablow
html_validator:
invalid_markup: 'contains invalid HTML mairkup: %{error}'
imports:
errors:
invalid_csv_file: 'Invalid CSV file. Error: %{error}'

2
config/locales/si.yml
View file

@ -973,8 +973,6 @@ si:
validation_errors:
one: යමක් තවමත් හරි නැත! කරුණාකර පහත දෝෂය සමාලෝචනය කරන්න
other: යමක් තවමත් හරි නැත! කරුණාකර පහත දෝෂ %{count} ක් සමාලෝචනය කරන්න
html_validator:
invalid_markup: 'වලංගු නොවන HTML සලකුණු අඩංගු වේ: %{error}'
imports:
errors:
over_rows_processing_limit: පේළි %{count} කට වඩා අඩංගු වේ

2
config/locales/sk.yml
View file

@ -828,8 +828,6 @@ sk:
many: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie
one: Niečo ešte nieje celkom v poriadku! Prosím skontroluj chybu uvedenú nižšie
other: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chyby uvedené nižšie
html_validator:
invalid_markup: 'obsahuje neplatný HTML kód: %{error}'
imports:
errors:
over_rows_processing_limit: obsahuje viac než %{count} riadkov

2
config/locales/sl.yml
View file

@ -1270,8 +1270,6 @@ sl:
one: Nekaj še ni čisto v redu! Spodaj si oglejte napako
other: Nekaj še ni čisto v redu! Spodaj si oglejte %{count} napak
two: Nekaj še ni čisto v redu! Spodaj si oglejte %{count} napaki
html_validator:
invalid_markup: 'vsebuje neveljavno oznako HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Neveljavna datoteka CSV. Napaka: %{error}'

2
config/locales/sq.yml
View file

@ -1214,8 +1214,6 @@ sq:
validation_errors:
one: Diçka s’është ende si duhet! Ju lutemi, shqyrtoni gabimin më poshtë
other: Diçka s’është ende si duhet! Ju lutemi, shqyrtoni %{count} gabimet më poshtë
html_validator:
invalid_markup: 'përmban elementë HTML të pavlefshëm: %{error}'
imports:
errors:
invalid_csv_file: 'Kartelë CSV e pavlefshme. Gabim: %{error}'

2
config/locales/sv.yml
View file

@ -1194,8 +1194,6 @@ sv:
validation_errors:
one: Något är inte riktigt rätt ännu! Kontrollera felet nedan
other: Något är inte riktigt rätt ännu! Kontrollera dom %{count} felen nedan
html_validator:
invalid_markup: 'innehåller ogiltig HTML: %{error}'
imports:
errors:
invalid_csv_file: 'Ogiltig CSV-fil. Felmeddelande: %{error}'

2
config/locales/th.yml
View file

@ -1195,8 +1195,6 @@ th:
today: วันนี้
validation_errors:
other: ยังมีบางอย่างไม่ถูกต้อง! โปรดตรวจทาน %{count} ข้อผิดพลาดด้านล่าง
html_validator:
invalid_markup: 'มีมาร์กอัป HTML ที่ไม่ถูกต้อง: %{error}'
imports:
errors:
invalid_csv_file: 'ไฟล์ CSV ไม่ถูกต้อง ข้อผิดพลาด: %{error}'

2
config/locales/tr.yml
View file

@ -1220,8 +1220,6 @@ tr:
validation_errors:
one: Bir şeyler ters gitti! Lütfen aşağıdaki hatayı gözden geçiriniz
other: Bir şeyler ters gitti! Lütfen aşağıdaki %{count} hatayı gözden geçiriniz
html_validator:
invalid_markup: 'geçersiz HTML markup içermektedir: %{error}'
imports:
errors:
invalid_csv_file: 'Geçersiz CSV dosyası. Hata: %{error}'

2
config/locales/uk.yml
View file

@ -1270,8 +1270,6 @@ uk:
many: Щось досі не гаразд! Перегляньте %{count} повідомлень про помилки
one: Щось досі не гаразд! Перегляньте повідомлення про помилку
other: Щось досі не гаразд! Перегляньте %{count} повідомлень про помилки
html_validator:
invalid_markup: 'містить неприпустиму HTML розмітку: %{error}'
imports:
errors:
invalid_csv_file: 'Хибний файл CSV. Помилка: %{error}'

2
config/locales/vi.yml
View file

@ -1195,8 +1195,6 @@ vi:
today: hôm nay
validation_errors:
other: Đã có %{count} lỗi xảy ra! Xem chi tiết bên dưới
html_validator:
invalid_markup: 'chứa đánh dấu HTML không hợp lệ: %{error}'
imports:
errors:
invalid_csv_file: 'Tập tin CSV không hợp lệ. Lỗi: %{error}'

2
config/locales/zh-CN.yml
View file

@ -1195,8 +1195,6 @@ zh-CN:
today: 今天
validation_errors:
other: 出错啦！检查一下下面 %{count} 处出错的地方吧
html_validator:
invalid_markup: '包含无效的 HTML 标记: %{error}'
imports:
errors:
invalid_csv_file: '无效的 CSV 文件。错误: %{error}'

2
config/locales/zh-HK.yml
View file

@ -1193,8 +1193,6 @@ zh-HK:
today: 今天
validation_errors:
other: 提交的資料有 %{count} 項問題
html_validator:
invalid_markup: 含有無效的HTML標記：%{error}
imports:
errors:
invalid_csv_file: 無效的 CSV 檔案。錯誤：%{error}

2
config/locales/zh-TW.yml
View file

@ -1197,8 +1197,6 @@ zh-TW:
today: 今天
validation_errors:
other: 唔…這是什麼鳥？請檢查以下 %{count} 項錯誤
html_validator:
invalid_markup: 含有無效的 HTML 語法：%{error}
imports:
errors:
invalid_csv_file: 無效的 CSV 檔案。錯誤訊息：%{error}

0
spec/controllers/admin/change_email_controller_spec.rb → spec/controllers/admin/change_emails_controller_spec.rb
View file

0
spec/controllers/admin/users/roles_controller.rb → spec/controllers/admin/users/roles_controller_spec.rb
View file

0
spec/helpers/admin/action_log_helper_spec.rb → spec/helpers/admin/action_logs_helper_spec.rb
View file

0
spec/serializers/activitypub/note_spec.rb → spec/serializers/activitypub/note_serializer_spec.rb
View file

0
spec/serializers/activitypub/update_poll_spec.rb → spec/serializers/activitypub/update_poll_serializer_spec.rb
View file

0
spec/services/remove_from_follwers_service_spec.rb → spec/services/remove_from_followers_service_spec.rb
View file

10
spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
View file

@ -25,7 +25,6 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
},
]
end
let(:retry_size) { 0 }
before do
queue_stub = double
@ -35,7 +34,6 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
allow(Sidekiq::ProcessSet).to receive(:new).and_return(process_set_stub)
sidekiq_stats_stub = double
allow(sidekiq_stats_stub).to receive(:retry_size).and_return(retry_size)
allow(Sidekiq::Stats).to receive(:new).and_return(sidekiq_stats_stub)
# Create a bunch of old statuses
@ -72,14 +70,6 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
expect(subject.under_load?).to be true
end
end
context 'when there is a huge amount of jobs to retry' do
let(:retry_size) { 1_000_000 }
it 'returns true' do
expect(subject.under_load?).to be true
end
end
end
describe '#get_budget' do