mastodon/app/views/statuses
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml Hide sensitive preview cards with blurhash (#13985) 2020-06-06 17:41:56 +02:00
_og_description.html.haml
_og_image.html.haml
_poll.html.haml Fix end-user-facing uses of inline CSS (#13438) 2020-04-28 10:16:55 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
_status.html.haml
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