272 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
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
Eugen Rochko	e55dce3176	Add federation relay support (#7998) ... * Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n	7 years ago
Thibaut Girka	402da8065c	Migrate glitch-soc keyword mutes to Mastodon's ... Completely remove glitch-soc's Keyword Mutes, migrate existing database records to CustomFilters. Handling of client-side filters is still not implemented in the glitch-soc front-end.	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
ThibG	1ca4e51eb3	Add option to not consider word boundaries when processing keyword filtering (#7975) ... * Add option to not consider word boundaries when filtering phrases * Add a few tests for keyword/phrase filtering	7 years ago
Eugen Rochko	cdb101340a	Keyword/phrase filtering (#7905) ... * Add keyword filtering GET|POST /api/v1/filters GET|PUT|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests	7 years ago
Thibaut Girka	4b0f27ba78	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
takayamaki	245fa1446a	fix : Disable reverted index changes (#7871)	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	bb21c6414d	Remove unused indexes (#7829)	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
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…	7 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	7 years ago
David Yip	5cff053944	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
nightpool	6310dd233a	Migration to cleanup blocked users that are still following (#7773) ... * Migration to cleanup blocked users that are still following * use follow directly, commit schema	7 years ago
Eugen Rochko	18e1de6a16	Migrate old web push subscriptions to ensure deliveries (#7764)	7 years ago
David Yip	26573ad7e6	Thread scopes through #matches?. #454. ... Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is used to calculate scope. Next up: additions to the test suite to demonstrate how scoping works.	7 years ago
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	7 years ago
Eugen Rochko	fb1ae0152d	Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688) ... * Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation It's completely not obvious but PG::UniqueViolation is just a string inside the exception message, not the actual class of the exception * Favourite does not have target_account_id	7 years ago
Eugen Rochko	19b4c666f7	Improve account index migration (#7684) ... * Improve account index migration - Display more progress in stdout - Catch PG::UniqueViolation when re-attributing favourites - Skip callbacks and validations when re-attributing other relationships * Use in_batches to reduce table lock-up during account merge * Use #say_with_time to benchmark each deduplication	7 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	c61c4565ab	Fix nil error in migration (#7680) ... Under rare circumstances the user record could have already been deleted before...	7 years ago
Yamagishi Kazutoshi	9130b3cda9	Fix broken migrate (regression from #7658) (#7674)	7 years ago
Eugen Rochko	a16e06bbf5	Deduplicate accounts and make unique username/domain index case-insensitive (#7658) ... Fix #6937 Fix #6837 Fix #6667	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Akihiko Odaki	ed4bae182b	Revert index change on statuses for api/v1/accounts account_id statuses (#7484)	7 years ago
Akihiko Odaki	42a1231245	Improve index on statuses for api/v1/accounts account_id statuses (#7476) ... Queries with the combination of account_id, id, and visibility can be categorized in three types: 1. Querying for public and unlisted to enumerate statuses visible to anyone. 2. Querying for public, unlisted, and private to enumerate statuses visible to follower. 3. Querying for direct to enumerate own direct statuses. 1 and 2 is covered by the index with condition 'visibility IN (0, 1, 2)'. It would bring better performance in case that there are many direct statuses. The index with condition 'visibility = 3' is just for 3. It would be much faster to query direct statuses thanks to this query. The total size of those two indexes are expected to be smaller than the deleted one because they are partial and does not have to cover all the table.	7 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago