You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
7 years ago
..
about Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
accounts Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
admin Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
admin_mailer Add invite request to pending account notification e-mail (#10528) 7 years ago
application Bump webpacker from 3.5.5 to 4.0.2 (#10277) 7 years ago
auth Fix sign up button not saying sign up when invite is used (#10623) 7 years ago
authorize_interactions
directories Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
errors
filters
follower_accounts Improve blocked view of profiles (#10491) 7 years ago
following_accounts Improve blocked view of profiles (#10491) 7 years ago
home Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
invites Fix maxed-out invites not showing up as expired in UI (#10274) 7 years ago
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
media
notification_mailer Bump webpacker from 3.5.5 to 4.0.2 (#10277) 7 years ago
oauth Add button to conveniently copy OAuth code (#11065) 7 years ago
public_timelines [Glitch] Redesign landing page 7 years ago
relationships Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
remote_follow Admission-based registrations mode (#10250) 7 years ago
remote_interaction Admission-based registrations mode (#10250) 7 years ago
remote_unfollows
settings Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
shared Bump webpacker from 3.5.5 to 4.0.2 (#10277) 7 years ago
shares
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
tags Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
user_mailer Bump webpacker from 3.5.5 to 4.0.2 (#10277) 7 years ago
well_known