luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-30 09:07:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/models
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
admin Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
concerns CAS + SAML authentication feature (#6425) 2018-02-04 05:42:13 +01:00
form Add option to show only local toots in timeline preview (#6292) 2018-02-04 06:00:10 +01:00
glitch Replace =~ with #matches?. #208. 2017-11-15 18:27:25 -06:00
web Change user_id column non-nullable (#6435) 2018-02-07 16:35:44 +01:00
account.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
account_domain_block.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
account_filter.rb Clean up admin UI for accounts (#6004) 2017-12-13 12:15:10 +01:00
account_moderation_note.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
admin.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
application_record.rb
block.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
context.rb
conversation.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
conversation_mute.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
custom_emoji.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
custom_emoji_filter.rb Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
domain_block.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
email_domain_block.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
export.rb
favourite.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
feed.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
follow.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
follow_request.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
glitch.rb Move KeywordMute into Glitch namespace. 2017-10-21 14:54:36 -05:00
home_feed.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
identity.rb CAS + SAML authentication feature (#6425) 2018-02-04 05:42:13 +01:00
import.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
instance.rb
instance_filter.rb
invite.rb Change user_id column non-nullable (#6435) 2018-02-07 16:35:44 +01:00
invite_filter.rb Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
list.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
list_account.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
list_feed.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
media_attachment.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
mention.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
mute.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
notification.rb Clear account cache of notification target_status (#6442) 2018-02-08 15:33:23 +01:00
preview_card.rb Ensure link thumbnails are not stretched to super low quality (#5932) 2017-12-09 00:56:16 +01:00
remote_follow.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
remote_profile.rb Introduce OStatus::TagManager (#5008) 2017-09-19 18:08:08 +02:00
report.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
report_filter.rb
search.rb
session_activation.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
setting.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
site_upload.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
status.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
status_pin.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
stream_entry.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
subscription.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
tag.rb Fix account and tag searches with leading/trailing spaces (#5965) 2017-12-10 19:35:46 +01:00
user.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
web.rb