glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	613e7c7521	Rename ResolveRemoteAccountService to ResolveAccountService (#6327 ) The service used to be named ResolveRemoteAccountService resolves local accounts as well.	7 years ago
David Yip	54148b9a4a	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	2c1ed5f872	Show mastodon on modal (#6129 )	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523 )	7 years ago
STJrInuyasha	7a889a8e12	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	f3be605286	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847 ) Rename Activitypub to ActivityPub	8 years ago
yhirano	8325866c61	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	0618f09939	Add spec coverage and refactor authorize_follows controller (#2505 )	8 years ago

10 Commits (22bc07998c7559a02b6a6ad0b3a23fc00ce2cf5b)