David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

..

concerns

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

2017-11-16 22:52:37 -06:00

form

…

glitch

Maintain case-insensitivity when merging multiple matchers (#213)

2017-11-13 11:06:02 -06:00

web

Fix some rubocop style issues (#5730)

2017-11-17 10:06:26 +09:00

account_domain_block.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

account_filter.rb

…

account_moderation_note.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

account.rb

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

2017-11-16 22:52:37 -06:00

application_record.rb

…

block.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

context.rb

…

conversation_mute.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

conversation.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

custom_emoji_filter.rb

…

custom_emoji.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

domain_block.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

email_domain_block.rb

Add uniqueness to block email domains (#5692)

2017-11-14 20:37:17 +01:00

export.rb

…

favourite.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

feed.rb

…

follow_request.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

follow.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

glitch.rb

Move KeywordMute into Glitch namespace.

2017-10-21 14:54:36 -05:00

import.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

instance_filter.rb

…

instance.rb

…

media_attachment.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

mention.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

mute.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

notification.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

preview_card.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

remote_follow.rb

…

remote_profile.rb

…

report_filter.rb

…

report.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

search.rb

…

session_activation.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

setting.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

site_upload.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

status_pin.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

status.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

stream_entry.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

subscription.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

tag.rb

Update model annotations to use BIGINT for IDs (#5461)

2017-11-12 16:18:50 +01:00

user.rb

Delegate some methods of User to @settings (#5706)

2017-11-15 16:05:20 +01:00

web.rb

…