You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 3e4b8636a0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.		2 years ago
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Fix style for hashes (#20518)	2 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Change how changes to media attachments are stored for edits (#17696)	3 years ago
_poll.html.haml	Refactor formatter (#17828)	3 years ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
_status.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	3 years ago
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	3 years ago
show.html.haml	Change public accounts pages to mount the web UI (#19319)	2 years ago