catstodon/app/models
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
..
admin Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
form Add separate setting for sidebar text (site_short_description) () 2018-07-31 18:59:34 +02:00
web Fix has_one association on Web::PushSubscription () 2018-06-09 21:11:14 +02:00
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
account_domain_block.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
account_filter.rb Clean up admin UI for accounts () 2017-12-13 12:15:10 +01:00
account_moderation_note.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
account_pin.rb Public profile endorsements (accounts picked by profile owner) () 2018-08-09 09:56:53 +02:00
admin.rb Add logging of admin actions () 2017-11-24 02:05:53 +01:00
application_record.rb Validate HTTP response length while receiving () 2018-03-26 14:02:10 +02:00
backup.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
block.rb Store URIs of follows, follow requests and blocks for ActivityPub () 2018-05-04 21:14:34 +02:00
bookmark.rb Thread scopes through #matches?. . 2018-06-03 23:00:50 -05:00
context.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl () 2017-07-07 04:02:06 +02:00
conversation.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
conversation_mute.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
custom_emoji.rb Add entity cache () 2018-04-27 01:38:10 +02:00
custom_emoji_filter.rb Change custom emoji search to ILIKE instead of = () 2018-04-10 15:46:27 +02:00
custom_filter.rb Add option to not consider word boundaries when processing keyword filtering () 2018-07-09 02:22:09 +02:00
domain_block.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
email_domain_block.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
export.rb Settings export refactor () 2017-04-13 13:02:02 +02:00
favourite.rb Improve counter caches on Status and Account () 2018-05-30 02:50:23 +02:00
feed.rb Lists () 2017-11-18 00:16:48 +01:00
follow.rb When follow is removed, remove endorsement () 2018-08-09 15:24:29 +02:00
follow_request.rb Store URIs of follows, follow requests and blocks for ActivityPub () 2018-05-04 21:14:34 +02:00
home_feed.rb Lists () 2017-11-18 00:16:48 +01:00
identity.rb CAS + SAML authentication feature () 2018-02-04 05:42:13 +01:00
import.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
instance.rb Add Instance class to list admin records () 2017-05-31 20:38:44 +02:00
instance_filter.rb Add instance search feature () 2017-09-13 12:30:07 +02:00
invite.rb Keyword/phrase filtering () 2018-06-29 15:34:36 +02:00
invite_filter.rb Add invite filter () 2017-12-01 16:40:02 +01:00
list.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
list_account.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
list_feed.rb Lists () 2017-11-18 00:16:48 +01:00
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
mention.rb Update dependencies for Ruby (2018-04-23) () 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) () 2018-04-23 11:29:17 +02:00
preview_card.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
relay.rb Add federation relay support () 2018-07-13 02:16:06 +02:00
remote_follow.rb Using double splat operator () 2017-12-06 11:41:57 +01:00
remote_profile.rb [WIP] Enable custom emoji on account pages and in the sidebar () 2018-04-01 23:55:42 +02:00
report.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
report_filter.rb Admin reports with accounts () 2017-04-18 19:36:18 +02:00
report_note.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
search.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl () 2017-07-07 04:02:06 +02:00
session_activation.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
setting.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
site_upload.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02:00
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
status_pin.rb Update dependencies for Ruby (2018-04-23) () 2018-04-23 11:29:17 +02: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) () 2018-04-23 11:29:17 +02:00
tag.rb Track trending tags () 2018-05-27 21:45:30 +02:00
trending_tags.rb Fix number of results returned from TrendingTags.get 2018-07-16 19:54:14 +02:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
web.rb Add extended about page stub 2017-01-13 03:24:41 +01:00