Jenkins f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-18 16:17:15 +00:00

..

activitypub

Federate pinned statuses over ActivityPub (#6610)

2018-03-04 09:19:11 +01:00

admin

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

api

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-11 09:17:21 +00:00

auth

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

concerns

If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)

2018-03-18 16:57:04 +01:00

oauth

…

settings

Fix data export page error

2018-02-24 00:29:26 +09:00

well_known

…

about_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

application_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

authorize_follows_controller.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-24 19:17:11 +00:00

emojis_controller.rb

Cache JSON of immutable ActivityPub representations (#6171)

2018-01-04 01:21:38 +01:00

follower_accounts_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

following_accounts_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

home_controller.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

media_proxy_controller.rb

…

remote_follow_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-02 00:11:41 -06:00

shares_controller.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

statuses_controller.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00

stream_entries_controller.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00

tags_controller.rb

…