David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
about	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
accounts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
admin	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	2018-05-04 13:26:25 +02:00
application
auth	Add contact e-mail hint to 2FA login form (#7376)	2018-05-06 10:52:36 +02:00
authorize_follows	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
errors
follower_accounts	Add preference to hide following/followers lists (#7532)	2018-05-18 02:26:51 +02:00
following_accounts	Add preference to hide following/followers lists (#7532)	2018-05-18 02:26:51 +02:00
home	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
invites	Able to deactivate invites if they aren't expired (#7163)	2018-04-17 13:52:08 +02:00
kaminari
layouts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Display content warning in mail notification emails (#6832)	2018-03-19 20:12:20 +01:00
oauth
remote_follow
remote_unfollows	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
shared	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
shares
stream_entries	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	2018-03-19 20:07:47 +01:00
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	2018-05-02 22:28:46 +02:00