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

Default follows for new users (#4871)

2017-09-10 09:58:38 +02:00

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

Improve admin UI for custom emojis, add copy/disable/enable (#5231)

2017-10-05 23:42:05 +02:00

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

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

block.rb

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

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

context.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

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

Improve admin UI for custom emojis, add copy/disable/enable (#5231)

2017-10-05 23:42:05 +02:00

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

Settings export refactor (#1646)

2017-04-13 13:02:02 +02:00

favourite.rb

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

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

feed.rb

Non-Serial ("Snowflake") IDs (#4801)

2017-10-04 09:56:37 +02:00

follow_request.rb

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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

follow.rb

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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

Add instance search feature (#4925)

2017-09-13 12:30:07 +02:00

instance.rb

Add Instance class to list admin records (#3443)

2017-05-31 20:38:44 +02:00

media_attachment.rb

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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 30237259367a0ef2b20908518b86bbeb358999b5

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

rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)

2017-08-28 19:12:09 +02:00

remote_profile.rb

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00

report_filter.rb

Admin reports with accounts (#2092)

2017-04-18 19:36:18 +02:00

report.rb

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

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

search.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

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 30237259367a0ef2b20908518b86bbeb358999b5

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

stream_entry.rb

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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

Add extended about page stub

2017-01-13 03:24:41 +01:00