300 Commits (e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c)

Author	SHA1	Message	Date
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	6 years ago
Eugen Rochko	73be8f38c1	Add profile directory (#9427) ... Fix #5578	6 years ago
Thibaut Girka	53d0293d25	Add database support for list show-reply preferences	6 years ago
Thibaut Girka	55edfd6e0e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	4afda5444a	Change identities id column to a bigint (#9371) ... * fix: change Identity's id column to a bigint This appears to be the last model created using a 5.0 migration, where column types defaulted to `integer` rather than `bigint`. This migration changes the column type to match that of all of the other ID columns. * Change user_id column in identities to bigint and fix down-migration	6 years ago
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	6 years ago
Eugen Rochko	d6b9a62e0a	Extract counters from accounts table to account_stats table (#9295)	7 years ago
Thibaut Girka	75b48dc177	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	f2290e311b	Remove progress estimate from MigrateAccountConversations (#9168)	7 years ago
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	93a1ab9030	Add progress indicators to MigrateAccountConversations (#9101) ... * Add progress indicators to MigrateAccountConversations * Avoid running expensive query for explain * Use exec_query instead of execute	7 years ago
Thibaut Girka	c13cfeac09	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	eef8d9a5f7	Add locality check to ActivityPub::FetchRemoteAccountService (#9109) ... * Add locality check to ActivityPub::FetchRemoteAccountService Fix #8643 Because there are a few places where it is called, it is difficult to confirm if they all previously checked it for locality. It's better to make sure within the service. * Remove faux-remote duplicates of local accounts	7 years ago
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	7 years ago
Eugen Rochko	4ea718ef18	Migrate all old direct messages to new conversations schema (#9085)	7 years ago
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	7 years ago
Eugen Rochko	fd5285658f	Add option to block reports from domain (#8830)	7 years ago
Eugen Rochko	a38a452481	Add unread indicator to conversations (#9009)	7 years ago
Eugen Rochko	ddd30f331c	Improve support for aspects/circles (#8950) ... * Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification	7 years ago
Thibaut Girka	a02244f17c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js	7 years ago
Eugen Rochko	7f9dd92a27	Track historical space stats in PgHero to determine PostgreSQL growth (#8906)	7 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	774ac47373	Add conversations API (#8832) ... * Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking	7 years ago
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	886af5ce19	Add fallback for PostgreSQL without upsert in CopyStatusStats (#8903) ... Fix #8590	7 years ago
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	7 years ago
aus-social	0a4739c732	lint pass 2 (#8878) ... * Code quality pass * Typofix * Update applications_controller_spec.rb * Update applications_controller_spec.rb	7 years ago
aus-social	1f98eae1cf	Lint pass (#8876)	7 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	025a06d322	Add missing indices for ON DELETE CASCADE constraints (#8332) ... Fix #8327	7 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	f13afa1ee9	Do not use WHERE NOT IN in CopyStatusStats migration (#8281) ... Fix #8275 As the batch operation progresses, the statuses_stats table grows, and the WHERE NOT IN subquery becomes more expensive	7 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	7 years ago
Eugen Rochko	edb1de7800	Make CopyStatusStats migration use batches of 1000 to avoid locks (#8256)	7 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	7 years ago
Thibaut Girka	80148d8edd	Split custom filter migration script using the post-deployment migration system ... There were some concerns with the custom filter migration script dropping a table, thus making it unsafe to run in a zero-downtime setting. Upstream introduced a way to run migrations after deployment, so revisit the old migration script to make use of this.	7 years ago
ThibG	4f24dc31dc	Fix FixAccountsUniqueIndex migration (#8212)	7 years ago
Eugen Rochko	464daffdf9	Upgrade Doorkeeper to 4.4.1 (#8197)	7 years ago
Eugen Rochko	be13e95d06	Fix null constraint violation in copy status stats migration (#8198)	7 years ago
Eugen Rochko	8e111b753a	Move status counters to separate table, count replies (#8104) ... * Move status counters to separate table, count replies * Migration to remove old counter columns from statuses table * Fix schema file	7 years ago
Eugen Rochko	fcb527cdd6	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	7 years ago
Eugen Rochko	434628d98f	Expect relays to answer with accept/reject (#8179)	7 years ago
ThibG	2a9950b2e2	Make some migration script more robust (fixes #8007) (#8170) ... Include a dummy Account class in the migration script containing only the attributes relevant to the migration in order to not rely as much on the codebase being in sync with the database schema.	7 years ago
Eugen Rochko	018a9e4e7f	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	7 years ago
Eugen Rochko	39e361a56d	Expect relays to answer with accept/reject (#8179)	7 years ago
ThibG	cbc2e6bd40	Make some migration script more robust (fixes #8007) (#8170) ... Include a dummy Account class in the migration script containing only the attributes relevant to the migration in order to not rely as much on the codebase being in sync with the database schema.	7 years ago
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.	7 years ago
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	7 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	7 years ago
Akihiko Odaki	7a68608237	Fix index detection a migration to revert index change (#8026)	7 years ago