From: Claire Date: Fri, 26 Nov 2021 21:53:55 +0000 (+0100) Subject: Merge branch 'main' into glitch-soc/merge-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9b861d56a9646e75caf1f7d60fa9eade566d3740;p=mastodon.git Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version. --- 9b861d56a9646e75caf1f7d60fa9eade566d3740 diff --cc .env.production.sample index 86f770e78,8eeff3794..13e89b40d --- a/.env.production.sample +++ b/.env.production.sample @@@ -55,19 -29,18 +55,20 @@@ DB_NAME=mastodon_productio DB_PASS= DB_PORT=5432 + - # ElasticSearch (optional) + # Elasticsearch (optional) # ------------------------ -ES_ENABLED=true -ES_HOST=localhost -ES_PORT=9200 +#ES_ENABLED=true +#ES_HOST=localhost +#ES_PORT=9200 # Authentication for ES (optional) -ES_USER=elastic -ES_PASS=password +#ES_USER=elastic +#ES_PASS=password + + # Secrets # ------- -# Make sure to use `rake secret` to generate secrets +# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web bundle exec rake secret` if you use docker compose) # ------- SECRET_KEY_BASE= OTP_SECRET= diff --cc app/models/form/admin_settings.rb index 0276ec058,6fc7c56fd..3202d1fc2 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@@ -26,9 -25,6 +26,8 @@@ class Form::AdminSetting preview_sensitive_media custom_css profile_directory + hide_followers_count - enable_keybase + flavour_and_skin thumbnail hero mascot @@@ -52,10 -45,6 +51,9 @@@ show_known_fediverse_at_about_page preview_sensitive_media profile_directory + hide_followers_count - enable_keybase + show_reblogs_in_public_timelines + show_replies_in_public_timelines trends trendable_by_default noindex diff --cc app/views/admin/settings/edit.html.haml index 373811ea3,33bfc43d3..b9daae8f0 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@@ -86,18 -89,6 +86,15 @@@ .fields-group = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html') + .fields-group + = f.input :hide_followers_count, as: :boolean, wrapper: :with_label, label: t('admin.settings.hide_followers_count.title'), hint: t('admin.settings.hide_followers_count.desc_html') + - .fields-group - = f.input :enable_keybase, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_keybase.title'), hint: t('admin.settings.enable_keybase.desc_html') - + .fields-group + = f.input :show_reblogs_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_reblogs_in_public_timelines.title'), hint: t('admin.settings.show_reblogs_in_public_timelines.desc_html') + + .fields-group + = f.input :show_replies_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_replies_in_public_timelines.title'), hint: t('admin.settings.show_replies_in_public_timelines.desc_html') + %hr.spacer/ .fields-group diff --cc config/locales-glitch/en.yml index 6268727a7,000000000..5cc2625fc mode 100644,000000..100644 --- a/config/locales-glitch/en.yml +++ b/config/locales-glitch/en.yml @@@ -1,25 -1,0 +1,23 @@@ +--- +en: + admin: - dashboard: - keybase: Keybase integration + settings: + enable_keybase: + desc_html: Allow your users to prove their identity via keybase + title: Enable keybase integration + outgoing_spoilers: + desc_html: When federating toots, add this content warning to toots that do not have one. It is useful if your server is specialized in content other servers might want to have under a Content Warning. Media will also be marked as sensitive. + title: Content warning for outgoing toots + hide_followers_count: + desc_html: Do not show followers count on user profiles + title: Hide followers count + show_reblogs_in_public_timelines: + desc_html: Show public boosts of public toots in local and public timelines. + title: Show boosts in public timelines + show_replies_in_public_timelines: + desc_html: In addition to public self-replies (threads), show public replies in local and public timelines. + title: Show replies in public timelines + generic: + use_this: Use this + settings: + flavours: Flavours diff --cc config/locales-glitch/es.yml index 7e8de1560,000000000..ad942a0c0 mode 100644,000000..100644 --- a/config/locales-glitch/es.yml +++ b/config/locales-glitch/es.yml @@@ -1,25 -1,0 +1,23 @@@ +--- +es: + admin: - dashboard: - keybase: Integración con keybase + settings: + enable_keybase: + desc_html: Permite a tus usuarixs comprobar su identidad por medio de keybase + title: Habilitar la integración con keybase + outgoing_spoilers: + desc_html: Cuando los toots federen, agrega esta etiqueta de contenido a los toots que no tengan. Es útil si tu servidor se especializa en contenido que otros servidores desearían tener con una advertencia de contenido. Los medios también se marcarán como sensibles. + title: Advertencia de contenido para los toots salientes + hide_followers_count: + desc_html: No mostrar el conteo de seguidorxs en perfiles de usuarix + title: Ocultar conteo de seguidorxs + show_reblogs_in_public_timelines: + desc_html: Mostrar retoots públicos en las línea de tiempo local y pública. + title: Mostrar retoots en líneas de tiempo públicas + show_replies_in_public_timelines: + desc_html: Además de auto-respuestas públicas (hilos), mostrar respuestas públicas en las línea de tiempo local y pública. + title: Mostrar respuestas en líneas de tiempo públicas + generic: + use_this: Usar + settings: - flavours: Ediciones ++ flavours: Ediciones diff --cc config/locales-glitch/ja.yml index 2be4e9ea0,000000000..3ecb46ccd mode 100644,000000..100644 --- a/config/locales-glitch/ja.yml +++ b/config/locales-glitch/ja.yml @@@ -1,25 -1,0 +1,23 @@@ +--- +ja: + admin: - dashboard: - keybase: Keybase統合 + settings: + enable_keybase: + desc_html: Keybaseにより身元の証明が可能となります + title: Keybase統合を有効にする + outgoing_spoilers: + desc_html: トゥートが連合される際、閲覧注意としてマークされていないトゥートにこの警告が追加されます。これはあなたのインスタンスが他のインスタンスに警告をして欲しいとされる投稿に特化している場合に便利です。 メディアは閲覧注意にマークされます。 + title: 発信するトゥートへの警告 + hide_followers_count: + desc_html: プロフィールページのフォロワー数を見られないようにします + title: フォロワー数を隠す + show_reblogs_in_public_timelines: + desc_html: ローカルタイムラインと連合タイムラインに公開投稿のブーストを表示します + title: 公開タイムラインにブーストを表示 + show_replies_in_public_timelines: + desc_html: 自分への公開投稿の返信に加えて、すべての公開投稿の返信をローカルタイムラインと連合タイムラインに表示します。 + title: 公開タイムラインに返信を表示 + generic: + use_this: これを使う + settings: + flavours: フレーバー diff --cc config/locales-glitch/ko.yml index ae7f091bb,000000000..aef10f677 mode 100644,000000..100644 --- a/config/locales-glitch/ko.yml +++ b/config/locales-glitch/ko.yml @@@ -1,25 -1,0 +1,23 @@@ +--- +ko: + admin: - dashboard: - keybase: 키베이스 연동 + settings: + enable_keybase: + desc_html: 사용자들이 키베이스를 통해 개인 신원을 증명할 수 있도록 허용 + title: 키베이스 연동 활성화 + outgoing_spoilers: + desc_html: 게시물들을 연합할 때, 열람주의가 달려있지 않다면 이 열람주의를 추가합니다. 다른 서버들이 열람주의를 하길 원하는 콘텐츠들에 특화된 서버에서 유용합니다. 미디어 또한 민감함으로 설정 됩니다. + title: 나가는 게시물에 대한 열람주의 + hide_followers_count: + desc_html: 사용자 프로필에 팔로워 수를 표시하지 않습니다 + title: 팔로워 수 숨기기 + show_reblogs_in_public_timelines: + desc_html: 공개글의 공개적인 부스트를 로컬과 공개 타임라인에 표시합니다. + title: 부스트를 공개 타임라인에 표시 + show_replies_in_public_timelines: + desc_html: 자기자신에 대한 답글(글타래)와 마찬가지로, 공개적인 답글을 로컬과 공개 타임라인에 표시합니다. + title: 답글을 공개 타임라인에 표시 + generic: + use_this: 사용하기 + settings: + flavours: 풍미 diff --cc config/locales-glitch/zh-CN.yml index ea1db3eb9,000000000..37a8307e8 mode 100644,000000..100644 --- a/config/locales-glitch/zh-CN.yml +++ b/config/locales-glitch/zh-CN.yml @@@ -1,25 -1,0 +1,23 @@@ +--- +zh-CN: + admin: - dashboard: - keybase: Keybase 集成 + settings: + enable_keybase: + desc_html: 允许你的用户使用 Keybase 证明身份 + title: 启用 Keybase 集成 + outgoing_spoilers: + desc_html: 在联邦化嘟文的时候，将这个内容警告添加到没有内容警告的嘟文中。如果你的服务器专用于其他服务器可能希望有内容警告的内容，它会很有用。媒体也将被标记为敏感。 + title: 对外嘟文的内容警告 + hide_followers_count: + desc_html: 不要在用户资料中显示关注者人数 + title: 隐藏关注者人数 + show_reblogs_in_public_timelines: + desc_html: 在本地和跨站时间线中显示公开嘟文的公开转嘟。 + title: 在公共时间线中显示转嘟 + show_replies_in_public_timelines: + desc_html: 除了公开的自我回复（线程模式），在本地和跨站时间轴中显示公开回复。 + title: 在公共时间轴中显示回复 + generic: + use_this: 使用这个 + settings: + flavours: 风味 diff --cc config/settings.yml index 953e7b3eb,06cee2532..094209822 --- a/config/settings.yml +++ b/config/settings.yml @@@ -28,14 -27,10 +28,13 @@@ defaults: &default preview_sensitive_media: false reduce_motion: false disable_swiping: false - show_application: true + show_application: false system_font_ui: false + system_emoji_font: false noindex: false - theme: 'default' + hide_followers_count: false - enable_keybase: true + flavour: 'glitch' + skin: 'default' aggregate_reblogs: true advanced_layout: false use_blurhash: true