fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 03:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/statuses
History
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
2020-04-02 20:32:00 +02:00
..
_attachment_list.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_detailed_status.html.haml Change reported media attachments to always be hidden in admin UI (#12879) 2020-01-18 19:50:43 +01:00
_og_description.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_og_image.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_poll.html.haml Improve polls: option lengths & redesign (#13257) 2020-04-02 17:10:55 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
_status.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
embed.html.haml Fix cache digesting log noise on status embeds (#12750) 2020-01-03 05:00:17 +01:00
show.html.haml Fix punycode being rendered instead of unicode in some places (#13030) 2020-02-03 18:44:54 +01:00