ed572490c1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
616b6867a0
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
fd69694749
Add "signed in as" header to some pages ( #4523 )
2017-08-05 04:24:58 +02:00
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)
2017-07-10 18:05:06 +02:00
8bed91d94c
Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )
...
Rename Activitypub to ActivityPub
2017-06-19 01:51:04 +02:00
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
2017-04-30 00:23:45 +02:00
6712d98c58
Add spec coverage and refactor authorize_follows controller ( #2505 )
2017-04-27 00:19:53 +02:00
David Yip