10 Commits (ccd923bef804e9c1e662f5d8e7b2d6c02bd84291)

Author	SHA1	Message	Date
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
Eugen Rochko	fd69694749	Add "signed in as" header to some pages (#4523)	7 years ago
Matt Jankowski	6619cfe934	Conditional validations no longer accept strings for if/unless (#3124)	7 years ago
Matt Jankowski	fdd7ee1cc7	Coverage for remote follows (#2694) ... * Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts	8 years ago
Matt Jankowski	874a240a58	Clean up generation of account webfinger string (#1477) ... * Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation	8 years ago
Drew DeVault	932b0b2f1f	Remote follow improvements ... This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.	8 years ago
Eugen Rochko	3e6b5d67dd	Fix uri expansion during remote follow	8 years ago
Eugen Rochko	df2f14d2dd	Adding remote follow button	8 years ago