Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +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 remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +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 454-allow-keyword-mutes-to-skip-mentions	2018-06-12 18:13:30 -05:00
well_known	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)	2017-12-27 18:21:12 +01:00
about_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
account_follow_controller.rb	Restful refactor of accounts/ routes (#2133)	2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb	Restful refactor of accounts/ routes (#2133)	2017-04-19 13:52:37 +02:00
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	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-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	Make Chrome splash screen same color as web UI's background color (#5169)	2017-10-02 01:23:32 +02:00
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	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-02 00:11:41 -06:00
remote_unfollows.rb	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02: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