mastodon/app/views
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-08-19 19:16:41 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
admin_mailer
application Fix lock icon not being shown when locking account in profile settings (#14190) 2020-07-01 13:51:50 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
authorize_interactions Fix misleading error when attempting to re-send a pending follow request (#13133) 2020-02-24 21:19:19 +01:00
directories Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
follower_accounts
following_accounts
home
invites Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
media Fix embedded player 2020-08-12 00:00:42 +02:00
notification_mailer
oauth Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
public_timelines Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
shared Remove fallback to long description on sidebar and meta description (#12119) 2019-10-08 22:08:55 +02:00
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-04-20 16:45:40 +02:00
user_mailer Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00