From d137d2ab878520dbcf7c45812b1e390aefdc6442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9lanie=20Chauvel?= Date: Mon, 17 May 2021 22:31:35 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Replace=20=E2=80=9Cstatus=E2=80=9D=20and=20?= =?UTF-8?q?=E2=80=9Cmessage=E2=80=9D=20by=20=E2=80=9Cpost=E2=80=9D=20in=20?= =?UTF-8?q?WebUI=20(#16271)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/activerecord.en.yml | 2 +- config/locales/doorkeeper.en.yml | 8 ++++---- config/locales/en.yml | 2 +- config/locales/simple_form.en.yml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index ec8dad1b191..d5f19ca6494 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -24,7 +24,7 @@ en: status: attributes: reblog: - taken: of status already exists + taken: of post already exists user: attributes: email: diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index ec322f07186..8aa0992845a 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -138,12 +138,12 @@ en: read:notifications: see your notifications read:reports: see your reports read:search: search on your behalf - read:statuses: see all statuses + read:statuses: see all posts write: modify all your account's data write:accounts: modify your profile write:blocks: block accounts and domains - write:bookmarks: bookmark statuses - write:favourites: favourite statuses + write:bookmarks: bookmark posts + write:favourites: favourite posts write:filters: create filters write:follows: follow people write:lists: create lists @@ -151,4 +151,4 @@ en: write:mutes: mute people and conversations write:notifications: clear your notifications write:reports: report other people - write:statuses: publish statuses + write:statuses: publish posts diff --git a/config/locales/en.yml b/config/locales/en.yml index d8ad5bd84a5..6056baf325a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1431,7 +1431,7 @@ en: edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account. explanation: Here are some tips to get you started final_action: Start posting - final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.' + final_step: 'Start posting! Even without followers your public posts may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.' full_handle: Your full handle full_handle_hint: This is what you would tell your friends so they can message or follow you from another server. review_preferences_action: Change preferences diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c4388ffc529..113aef2d381 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -52,7 +52,7 @@ en: setting_display_media_hide_all: Always hide media setting_display_media_show_all: Always show media setting_hide_network: Who you follow and who follows you will be hidden on your profile - setting_noindex: Affects your public profile and status pages + setting_noindex: Affects your public profile and post pages setting_show_application: The application you use to post will be displayed in the detailed view of your posts setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed @@ -197,12 +197,12 @@ en: severity: Rule notification_emails: digest: Send digest e-mails - favourite: Someone favourited your status + favourite: Someone favourited your post follow: Someone followed you follow_request: Someone requested to follow you mention: Someone mentioned you pending_account: New account needs review - reblog: Someone boosted your status + reblog: Someone boosted your post report: New report is submitted trending_tag: An unreviewed hashtag is trending rule: From 97539b6a96c1a3773aceb492d213620132d2a1fb Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 17 May 2021 22:36:08 +0200 Subject: [PATCH 2/4] Fix host check on healthcheck path not being disabled (#16270) Fixes #16251 There was a typo in #16243 --- config/initializers/1_hosts.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/1_hosts.rb b/config/initializers/1_hosts.rb index f470fddb368..6ff0845c466 100644 --- a/config/initializers/1_hosts.rb +++ b/config/initializers/1_hosts.rb @@ -31,6 +31,6 @@ Rails.application.configure do config.hosts << host if host.present? config.hosts << web_host if web_host.present? config.hosts.concat(alternate_domains) if alternate_domains.present? - config.hosts_authorization = { exclude: ->(request) { request.path == '/health' } } + config.host_authorization = { exclude: ->(request) { request.path == '/health' } } end end From 3f599c34334a6a75f95a3e22e405a9f56dc33dd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 22:36:29 +0200 Subject: [PATCH 3/4] Bump puma from 5.3.0 to 5.3.1 (#16257) Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.3.0...v5.3.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 913e40b1e5c..ea92c032e84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,7 +428,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.3.0) + puma (5.3.1) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) From 08d6a7764ffb957b2ee442dd75b54c295c013588 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 22:36:44 +0200 Subject: [PATCH 4/4] Bump nokogiri from 1.11.3 to 1.11.4 (#16252) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ea92c032e84..1696facdec2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4)