David Yip 4cca1d1e7e

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/controllers/auth/confirmations_controller.rb

2017-12-30 17:20:07 -06:00

..

admin

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

concerns

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +01:00

form

Add more instance stats APIs (#6125)

2017-12-29 19:52:04 +01:00

glitch

Replace =~ with #matches?. #208.

2017-11-15 18:27:25 -06:00

web

Lists (#5703)

2017-11-18 00:16:48 +01:00

account_domain_block.rb

Lists (#5703)

2017-11-18 00:16:48 +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

account.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

admin.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01: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

Lists (#5703)

2017-11-18 00:16:48 +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

Lists (#5703)

2017-11-18 00:16:48 +01:00

conversation.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

custom_emoji.rb

Lists (#5703)

2017-11-18 00:16:48 +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

Settings export refactor (#1646)

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

favourite.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

feed.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

follow_request.rb

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +01:00

follow.rb

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +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

import.rb

Lists (#5703)

2017-11-18 00:16:48 +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

invite_filter.rb

Add invite filter (#5862)

2017-12-01 16:40:02 +01:00

invite.rb

Add invite filter (#5862)

2017-12-01 16:40:02 +01:00

list_account.rb

Add list of lists component to web UI (#5811)

2017-12-05 23:02:27 +01:00

list_feed.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

list.rb

Change account_id non-nullable in lists (#5979)

2017-12-12 04:11:17 +01:00

media_attachment.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

mention.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

mute.rb

Update annotations on Follow, FollowRequest, and Mute.

2017-11-17 17:41:15 -06:00

notification.rb

Fix N+1 at notification (#5752)

2017-11-19 15:32:48 +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_filter.rb

Admin reports with accounts (#2092)

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

report.rb

Lists (#5703)

2017-11-18 00:16:48 +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

Remove duplicate annotate (#5910)

2017-12-07 04:53:42 +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_pin.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

status.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-12-30 17:20:07 -06:00

stream_entry.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

subscription.rb

Lists (#5703)

2017-11-18 00:16:48 +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

2017-12-30 17:20:07 -06:00

web.rb

Add extended about page stub

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