Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…

2018-06-15 20:51:39 +02:00

..

admin

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

concerns

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

2018-06-07 05:13:49 -05:00

form

Add option to show only local toots in timeline preview (#6292)

2018-02-04 06:00:10 +01:00

glitch

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 16:39:30 -05:00

web

Fix has_one association on Web::PushSubscription (#7767)

2018-06-09 21:11:14 +02:00

account_domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

account_filter.rb

Clean up admin UI for accounts (#6004)

2017-12-13 12:15:10 +01:00

account_moderation_note.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

account.rb

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

2018-05-18 08:47:10 -05:00

admin.rb

Add logging of admin actions (#5757)

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

application_record.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

backup.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

block.rb

Store URIs of follows, follow requests and blocks for ActivityPub (#7160)

2018-05-04 21:14:34 +02:00

bookmark.rb

Thread scopes through #matches?. #454.

2018-06-03 23:00:50 -05: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 dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

conversation.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

custom_emoji_filter.rb

Change custom emoji search to ILIKE instead of = (#7099)

2018-04-10 15:46:27 +02:00

custom_emoji.rb

Add entity cache (#7271)

2018-04-27 01:38:10 +02:00

domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

email_domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

export.rb

Settings export refactor (#1646)

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

favourite.rb

Improve counter caches on Status and Account (#7644)

2018-05-30 02:50:23 +02:00

feed.rb

Lists (#5703)

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

follow_request.rb

Store URIs of follows, follow requests and blocks for ActivityPub (#7160)

2018-05-04 21:14:34 +02:00

follow.rb

Store URIs of follows, follow requests and blocks for ActivityPub (#7160)

2018-05-04 21:14:34 +02: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

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02: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 autofollow option to invites (#7805)

2018-06-15 18:00:23 +02:00

list_account.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

list_feed.rb

Lists (#5703)

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

list.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

media_attachment.rb

Remove unnecessary code from MediaAttachment#set_type_and_extension.

2018-05-04 02:38:04 -05:00

mention.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

mute.rb

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

2018-05-03 17:23:44 -05:00

notification.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

preview_card.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

remote_follow.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

remote_profile.rb

[WIP] Enable custom emoji on account pages and in the sidebar (#6124)

2018-04-01 23:55:42 +02:00

report_filter.rb

Admin reports with accounts (#2092)

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

report_note.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

report.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02: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 dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

setting.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

site_upload.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

status_pin.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

status.rb

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

2018-06-07 05:13:49 -05:00

stream_entry.rb

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

2018-05-03 17:23:44 -05:00

subscription.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

tag.rb

Track trending tags (#7638)

2018-05-27 21:45:30 +02:00

trending_tags.rb

Remove trending hashtags (#7711)

2018-06-04 02:18:18 +02:00

user.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

web.rb

Add extended about page stub

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