Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
activitypub	Cache featured collections, as well as outbox, followers and following (#10467)	2019-04-04 01:30:44 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
concerns	Move signature verification stoplight to the requests themselves (#10813)	2019-05-23 15:22:39 +02:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
well_known	Allow turning keybase off instance-wide	2019-04-19 00:57:39 +02:00
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
public_timelines_controller.rb	[Glitch] Redesign landing page	2019-03-13 15:53:00 +01:00
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +02:00
stream_entries_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +02:00
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00