mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
178e151019
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
---|---|---|
.. | ||
icons | ||
mailer | ||
alert_badge.png | ||
app-icon.svg | ||
clippy_frame.png | ||
clippy_wave.gif | ||
elephant_ui_conversation.svg | ||
elephant_ui_disappointed.svg | ||
elephant_ui_greeting.svg | ||
elephant_ui_plane.svg | ||
elephant_ui_working.svg | ||
friends-cropped.png | ||
icon_about.png | ||
icon_blocks.png | ||
icon_bookmarks.png | ||
icon_developers.png | ||
icon_direct.png | ||
icon_docs.png | ||
icon_domain_blocks.png | ||
icon_follow_requests.png | ||
icon_home.png | ||
icon_invite.png | ||
icon_keyboard_shortcuts.png | ||
icon_likes.png | ||
icon_lists.png | ||
icon_local.png | ||
icon_logout.png | ||
icon_mobile_apps.png | ||
icon_mutes.png | ||
icon_notifications.png | ||
icon_pin.png | ||
icon_profile_directory.png | ||
icon_public.png | ||
icon_settings.png | ||
icon_tos.png | ||
logo_full.svg | ||
logo_transparent.svg | ||
logo-symbol-icon.svg | ||
logo-symbol-wordmark.svg | ||
logo.svg | ||
preview.png | ||
reticle.png | ||
screenshot.jpg | ||
start.png | ||
void.png |