Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

activitypub

Do not try fetching keys of unknown accounts on a Delete from them (#10326)

2019-03-20 17:20:16 +01:00

admin

Provide a link to existing domain block when trying to block an already-blocked domain (#10663)

2019-05-03 20:36:36 +02:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

auth

Check that an invite link is valid before bypassing approval mode (#10657)

2019-05-02 04:30:12 +02:00

concerns

…

oauth

…

settings

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-10 21:19:21 +02:00

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

home_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

relationships_controller_spec.rb

…

remote_follow_controller_spec.rb

…

remote_interaction_controller_spec.rb

…

remote_unfollows_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

…