10 Commits (8c906efad0fe585263c4736687d13cc3ebf7dae4)

Author	SHA1	Message	Date
Jenkins	3cd4a0804b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	b5162e2aff	Rename ResolveRemoteAccountService to ResolveAccountService (#6327) ... The service used to be named ResolveRemoteAccountService resolves local accounts as well.	7 years ago
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
STJrInuyasha	098eef3211	Remote following success page (#4129) ... * Added a success page to remote following Includes follow-through links to web (the old redirect target) and back to the remote user's profile * Use Account.new in spec instead of a fake with only id (fixes spec) * Fabricate(:account) over Account.new * Remove self from the success text (and all HTML with it)	7 years ago
Eugen Rochko	8bed91d94c	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) ... Rename Activitypub to ActivityPub	7 years ago
yhirano	7c65bcbdb7	Downgrade rubocop 0.48.1 => 0.46.0 (#2628) ... * downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/**/* from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop	8 years ago
Matt Jankowski	6712d98c58	Add spec coverage and refactor authorize_follows controller (#2505)	8 years ago