luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 12:34:32 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
v2
web
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
push_controller_spec.rb
salmon_controller_spec.rb
subscriptions_controller_spec.rb