Thibaut Girka 4b0f27ba78 Merge branch 'master' into glitch-soc/merge-upstream

2018-06-24 14:32:22 +02:00

..

activitypub

Better pagination for ActivityPub outbox (#7356)

2018-05-04 19:19:11 +02:00

admin

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

auth

Fix confirmations_controller

2018-06-21 23:48:54 +02:00

concerns

HTTP signatures spec no longer requires algorithms field (#7525)

2018-05-17 04:03:28 +02:00

oauth

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-19 22:41:10 +02:00

settings

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

application_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

authorize_follows_controller.rb

…

emojis_controller.rb

…

follower_accounts_controller.rb

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

2018-05-18 08:47:10 -05:00

following_accounts_controller.rb

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

2018-05-18 08:47:10 -05:00

home_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05:00

intents_controller.rb

Add tests for intents_controller (#7763)

2018-06-09 22:47:50 +02:00

invites_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-15 20:51:39 +02:00

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

Raise Mastodon::RaceConditionError if Redis lock failed (#7511)

2018-05-16 12:29:45 +02:00

remote_follow_controller.rb

…

remote_unfollows_controller.rb

Add tests for remote_unfollows_controller (#7879)

2018-06-24 19:55:55 +09:00

shares_controller.rb

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

statuses_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

stream_entries_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

tags_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00