Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e #2339

ClearlyClaire · 2023-07-30T11:33:03Z

This one includes many redesigns to the vanilla UI (which were, for the most part, not applied to the glitch flavor yet), as well as a new interaction modal, and a few important bugfixes.

Postponed changes (recap)

59478a1 (UI focus changes, see Port UI focus behavior/styling changes from upstream #2342)
cfd50f3 (UI focus changes, see Port UI focus behavior/styling changes from upstream #2342)
4d01d1a not sure this is a good idea (16:9 cropping changes, see Consider adopting upstream's behavior for media previews #2346)
6b2952d too much I dislike in this for now (link previews redesign, see Consider porting link preview card design changes from upstream #2343)
4299208 follow-up to 6b2952d (link previews redesign, see Consider porting link preview card design changes from upstream #2343)
bbea052 (emoji picker fix, dependent on onboarding changes, see Port onboarding changes from upstream #2200)
1e4ccc6 (role badges redesign, see Port upstream's role badge design #2341)

Merge upstream changes up to `1e3b192`

Conflicts

app/models/account.rb:
Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables.
Ported upstream changes.
config/initializers/content_security_policy.rb:
Upstream added AZURE_ALIAS_HOST. Glitch-soc's version of the file is completely different.
Added AZURE_ALIAS_HOST to our version of the file.

Ported changes

Merge upstream changes up to `144a406`

Conflicts

app/views/layouts/application.html.haml:
Upstream removed the crossorigin attribute from preload_pack_asset. Glitch-soc had different calls to preload_pack_asset because of the different theming system.
Ported the change.
app/views/layouts/embedded.html.haml:
Upstream removed the crossorigin attribute from preload_pack_asset. Glitch-soc had different calls to preload_pack_asset because of the different theming system.
Ported the change.

Merge upstream changes up to `5b45796`

Conflicts

config/initializers/content_security_policy.rb:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.

Ported changes

e4ea80d

Postponed changes

59478a1 (UI focus)

Merge upstream changes up to `cfd50f3`

Conflicts

None

Ported changes

217ef7f

Postponed changes

cfd50f3 (UI focus)

Merge upstream changes up to `ce1f35d`

Conflicts

db/schema.rb:
Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.

Ported changes

Postponed changes

4d01d1a not sure this is a good idea (16:9 cropping)
6b2952d too much I dislike in this for now (link previews redesign)
4299208 follow-up to 6b2952d (link previews redesign)

Skipped changes

5e8cbb5 disagree with this

Merge upstream changes up to `1814990`

Conflicts

None

Ported changes

Merge upstream changes up to `3554c52`

Conflicts

app/controllers/authorize_interactions_controller.rb:
Small conflict due to our theming system.
streaming/index.js:
Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts.
Applied the refactor.

Additional changes

Ported changes

Postponed changes

bbea052 (emoji picker fix, dependent on onboarding changes)
1e4ccc6 (role badges redesign)

Co-authored-by: Claire <[email protected]>

…stodon#26070)

…on#25889)

…t being replied to (mastodon#24685)

…upgrades (mastodon#26023)

…display names (mastodon#25276)

…b UI (mastodon#26126)

Port ce1f35d to glitch-soc Signed-off-by: Claire <[email protected]>

…in web UI Port f826a95 to glitch-soc Signed-off-by: Claire <[email protected]>

…oc/merge-upstream

Port 6781dc6 to glitch-soc Signed-off-by: Claire <[email protected]>

Port a4b69be to glitch-soc Signed-off-by: Claire <[email protected]>

…oc/merge-upstream Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.

…stem

Port b4e739f to glitch-soc Co-authored-by: Eugen Rochko <[email protected]> Signed-off-by: Claire <[email protected]>

Port a4ec187 to glitch-soc Signed-off-by: Claire <[email protected]>

Plastikmensch · 2023-07-30T16:04:46Z

I think some CSS is missing/broken with the new interaction modal:

ClearlyClaire · 2023-07-30T16:26:31Z

You're right 😩

Seems like it's using the search popout redesign…

Plastikmensch · 2023-07-30T16:30:26Z

You're right 😩

Seems like it's using the search popout redesign…

In that case merging #2333 first would solve that.
Or it could be postponed.

Plastikmensch

GitHub is incredibly unresponsive for me and some changes I can't really test for, but everything seems to work.

Not sure I like the interaction modal querying the peers api when it's disabled, but that's an upstream issue.

Oh wait, the "Take me home" button doesn't seem to do anything.
Seems like a script is blocked by CSP.
Not sure if that's a dev vs prod thing again though.

ClearlyClaire · 2023-07-30T18:07:25Z

Oh wait, the "Take me home" button doesn't seem to do anything.
Seems like a script is blocked by CSP.
Not sure if that's a dev vs prod thing again though.

I'm not able to reproduce this. What's the error?

Plastikmensch · 2023-07-30T18:12:08Z

I'm not able to reproduce this. What's the error?

Refused to load the script 'http://localhost:3000/packs/js/common-bbc7fe25912a9e972eea.js'
because it violates the following Content Security Policy directive: "default-src 'none'".
Note that 'script-src-elem' was not explicitly set, so 'default-src' is used as a fallback.

Refused to load the script 'http://localhost:3000/packs/js/core/remote_interaction_helper-1b9b83882afd9c767fc3.chunk.js'
because it violates the following Content Security Policy directive: "default-src 'none'".
Note that 'script-src-elem' was not explicitly set, so 'default-src' is used as a fallback.

Then it's probably a dev vs prod thing again...
Thank you for looking into it though.

And also for skipping some of the design regressions.

ClearlyClaire · 2023-07-30T18:47:05Z

Ah, this may very well be a dev env thing, unlike upstream we don't set a default CSP in the development environment, so the override will disable everything, and there is no default script-src to fall back to.

We may want to reuse upstream's CSP definition at some point…

Plastikmensch · 2023-07-30T21:21:34Z

Sorry, I missed that, but 09ebf7e should've been also applied to app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx

It makes no functional difference and the check-i18n workflow is broken anyway, but I wanted to mention it.

Another thing I missed because of GitHub's unresponsiveness is that aa1789f added .orig files. I don't think that was intentional?

Leatherface75 · 2023-08-11T15:59:57Z

Anyone else getting 500 error after latest upstream update?
When i revert back it works as it should again.

ClearlyClaire · 2023-08-11T16:00:53Z

As always, when getting 500 errors, look at mastodon-web logs.

Leatherface75 · 2023-08-11T16:10:58Z

Tried so see in logs from systemd but didn't find anything useful but i can check again later.

ClearlyClaire · 2023-08-11T18:39:54Z

The most likely reason is that you forgot to run database migrations, but the errors will shed more light! On 500 errors, what you want to look at is journalctl -u mastodon-web

Leatherface75 · 2023-08-11T20:11:04Z

The most likely reason is that you forgot to run database migrations, but the errors will shed more light! On 500 errors, what you want to look at is journalctl -u mastodon-web

Well if that was needed then you're right that's probably the reason.
I thought it was only needed in next big update upstream.

I just did this

bundle install
yarn install
RAILS_ENV=production bundle exec rails assets:precompile

Leatherface75 · 2023-08-11T20:37:01Z

Ok it seems to work not thanks for the help.

mjankowski and others added 30 commits July 19, 2023 08:44

Cleanup unused portions of statuses/status partial (mastodon#26045)

6edd404

Wrong count in response when removing favourite/reblog (mastodon#24365)

4c18928

Co-authored-by: Claire <[email protected]>

Paperclip: add support for Azure blob storage (mastodon#23607)

b848ba3

Fix a missing redirection on getting-started in multi column mode (ma…

586b1c9

…stodon#26070)

Fix haml-lint Rubocop Style/NumericPredicate cop (mastodon#26040)

df05ece

Change casing for 'Server Settings' string (mastodon#26011)

cabe1ea

Move localized subject mailer shared example to separate file (mastod…

285a3df

…on#25889)

Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (mastodon#26039)

a5842df

Fix Lint/Void cop (mastodon#25922)

1cceb62

Add stricter protocol fields validation for accounts (mastodon#25937)

1e3b192

Improve the bug report templates (mastodon#25621)

4ea041f

Fix the crossorigin attribute (mastodon#26096)

42698b4

Fix replica being used even if not explicitly defined (mastodon#26074)

5cbc402

Clean up unused application records (mastodon#24871)

144a406

Change thread view to scroll to the selected post rather than the pos…

e4ea80d

…t being replied to (mastodon#24685)

Change default KeyGenerator digest to SHA1 to fix cookies in rolling …

934c7b3

…upgrades (mastodon#26023)

change focus ui for keyboard only input (mastodon#25935)

59478a1

Use username as display name for suspended users or users with blank …

14fad60

…display names (mastodon#25276)

Fix CSP headers being unintendedly wide (mastodon#26105)

e5f1000

Fix linting issue (mastodon#26106)

5b45796

Replace 'favourite' by 'favorite' for American English (mastodon#26009)

217ef7f

Override default Action Mailer preview_path (mastodon#26110)

296ec6c

Favourits -> Favorites (mastodon#26109)

1b4cf0e

Bump version to v4.1.5 (mastodon#26108)

f2c6833

Fix incorrect connect timeout in outgoing requests (mastodon#26116)

0078e7e

Fix missing translation strings for importing lists (mastodon#26120)

db310f3

Use valid email address for first account (mastodon#26114)

3abe0fc

Update haml-lint 0.49.1 (mastodon#26118)

67016dd

Fix focus and hover styles in web UI (mastodon#26125)

cfd50f3

Remove back button from bookmarks, favourites and lists screens in we…

5e8cbb5

…b UI (mastodon#26126)

ClearlyClaire and others added 2 commits July 30, 2023 15:50

[Glitch] Revert poll colors to green outside of compose form

887a17b

Port ce1f35d to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Add published date and author to news on the explore screen …

450f75b

…in web UI Port f826a95 to glitch-soc Signed-off-by: Claire <[email protected]>

ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from d3fb4c0 to 450f75b Compare July 30, 2023 13:51

ClearlyClaire and others added 7 commits July 30, 2023 15:54

Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-s…

454d856

…oc/merge-upstream

[Glitch] Preserve translation on status re-import

88ba538

Port 6781dc6 to glitch-soc Signed-off-by: Claire <[email protected]>

[Glitch] Fix missing GIF badge in account gallery

879c7ed

Port a4b69be to glitch-soc Signed-off-by: Claire <[email protected]>

Fix interaction modal being broken because of glitch-soc's theming sy…

a1f1424

…stem

[Glitch] Change interaction modal in web UI

aa1789f

Port b4e739f to glitch-soc Co-authored-by: Eugen Rochko <[email protected]> Signed-off-by: Claire <[email protected]>

[Glitch] Change the wording of the dismissable explore prompt

403a5c0

Port a4ec187 to glitch-soc Signed-off-by: Claire <[email protected]>

ClearlyClaire changed the title ~~Merge upstream changes~~ Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e Jul 30, 2023

Fix CSP tests in glitch-soc

73a3228

ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 144c7f2 to 73a3228 Compare July 30, 2023 15:30

ClearlyClaire marked this pull request as ready for review July 30, 2023 15:36

Plastikmensch approved these changes Jul 30, 2023

View reviewed changes

ClearlyClaire merged commit e96a904 into glitch-soc:main Jul 30, 2023
35 of 36 checks passed

Plastikmensch mentioned this pull request Jul 30, 2023

Remove .orig files #2347

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e #2339

Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e #2339

ClearlyClaire commented Jul 30, 2023 •

edited

Loading

Plastikmensch commented Jul 30, 2023

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023

Plastikmensch left a comment •

edited

Loading

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023 •

edited

Loading

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023 •

edited

Loading

Leatherface75 commented Aug 11, 2023

ClearlyClaire commented Aug 11, 2023

Leatherface75 commented Aug 11, 2023

ClearlyClaire commented Aug 11, 2023

Leatherface75 commented Aug 11, 2023 •

edited

Loading

Leatherface75 commented Aug 11, 2023

Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e #2339

Merge upstream changes up to 3554c527954441fd924586a49c7d99a89101ac7e #2339

Conversation

ClearlyClaire commented Jul 30, 2023 • edited Loading

Postponed changes (recap)

Merge upstream changes up to 1e3b192

Conflicts

Ported changes

Merge upstream changes up to 144a406

Conflicts

Merge upstream changes up to 5b45796

Conflicts

Ported changes

Postponed changes

Merge upstream changes up to cfd50f3

Conflicts

Ported changes

Postponed changes

Merge upstream changes up to ce1f35d

Conflicts

Ported changes

Postponed changes

Skipped changes

Merge upstream changes up to 1814990

Conflicts

Ported changes

Merge upstream changes up to 3554c52

Conflicts

Additional changes

Ported changes

Postponed changes

Plastikmensch commented Jul 30, 2023

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023

Plastikmensch left a comment • edited Loading

Choose a reason for hiding this comment

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023 • edited Loading

ClearlyClaire commented Jul 30, 2023

Plastikmensch commented Jul 30, 2023 • edited Loading

Leatherface75 commented Aug 11, 2023

ClearlyClaire commented Aug 11, 2023

Leatherface75 commented Aug 11, 2023

ClearlyClaire commented Aug 11, 2023

Leatherface75 commented Aug 11, 2023 • edited Loading

Leatherface75 commented Aug 11, 2023

ClearlyClaire commented Jul 30, 2023 •

edited

Loading

Merge upstream changes up to `1e3b192`

Merge upstream changes up to `144a406`

Merge upstream changes up to `5b45796`

Merge upstream changes up to `cfd50f3`

Merge upstream changes up to `ce1f35d`

Merge upstream changes up to `1814990`

Merge upstream changes up to `3554c52`

Plastikmensch left a comment •

edited

Loading

Plastikmensch commented Jul 30, 2023 •

edited

Loading

Plastikmensch commented Jul 30, 2023 •

edited

Loading

Leatherface75 commented Aug 11, 2023 •

edited

Loading