635 Commits (44fd66f0c6bff9cd94ba55345640c913cd733948)

Author	SHA1	Message	Date
Claire	56f9c44f33	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	24f9ea7818	Fix webauthn secure key authentication (#16792) ... * Add tests * Fix webauthn secure key authentication Fixes #16769	3 years ago
Claire	3622110778	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.	4 years ago
Eugen Rochko	52e5c07948	Change routing paths to use usernames in web UI (#16171)	4 years ago
Claire	bf827b17e1	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	e0af97164a	Fix followers synchronization mechanism not working when URI has empty path (#16744) ... Follow-up to #16510, forgot the controller exposing the actual followers…	4 years ago
Claire	f1e6884d6b	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	db57bff11d	Stop setting a shortcode to newly-created media attachments (#16730) ... * Stop setting a shortcode to newly-created media attachments The WebUI has stopped using the “short media URL” in ages. This isn't used anywhere except for mail notifications. Deprecating it would allow us to eventually get rid of at least a database column and corruption-prone index, as well as a controller. * Fix tests	4 years ago
Claire	463d23dfd5	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	94bcf45321	Fix authentication failures after going halfway through a sign-in attempt (#16607) ... * Add tests * Add security-related tests My first (unpublished) attempt at fixing the issues introduced (extremely hard-to-exploit) security vulnerabilities, addressing them in a test. * Fix authentication failures after going halfway through a sign-in attempt * Refactor `authenticate_with_sign_in_token` and `authenticate_with_two_factor` to make the two authentication steps more obvious	4 years ago
Claire	8ec4be4233	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.	4 years ago
Claire	4ac78e2a06	Add feature to automatically delete old toots (#16529) ... * Add account statuses cleanup policy model * Record last inspected toot to delete to speed up successive calls to statuses_to_delete * Add service to cleanup a given account's statuses within a budget * Add worker to go through account policies and delete old toots * Fix last inspected status id logic All existing statuses older or equal to last inspected status id must be kept by the current policy. This is an invariant that must be kept so that resuming deletion from the last inspected status remains sound. * Add tests * Refactor scheduler and add tests * Add user interface * Add support for discriminating based on boosts/favs * Add UI support for min_reblogs and min_favs, rework UI * Address first round of review comments * Replace Snowflake#id_at_start with with_random parameter * Add tests * Add tests for StatusesCleanupController * Rework settings page * Adjust load-avoiding mechanisms * Please CodeClimate	4 years ago
Claire	d1c87be8cf	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	30ce6e395c	Fix user email address being banned on self-deletion (#16503) ... * Add tests * Fix user email address being banned on self-deletion Fixes #16498	4 years ago
Claire	3160e050a9	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.	4 years ago
Eugen Rochko	771c9d4ba8	Add ability to skip sign-in token authentication for specific users (#16427) ... Remove "active within last two weeks" exception for sign in token requirement Change admin reset password to lock access until the password is reset	4 years ago
Claire	49219508bc	Fix anonymous access to outbox not being cached by the reverse proxy (#16458) ... * Fix anonymous access to outbox not being cached by the reverse proxy Up until now, anonymous access to outbox was marked as public, but with a 0 duration for caching, which means remote proxies would only serve from cache when the server was completely overwhelmed. Changed that cache duration to one minute, so that repeated anonymous access to one account's outbox can be appropriately cached. Also added `Signature` to the `Vary` header in case a page is requested, so that authenticated fetches are never served from cache (which only contains public toots). * Remove Vary: Accept header from webfinger controller Indeed, we have stopped returning xrd, and only ever return jrd, so the Accept request header does not matter anymore. * Cache negative webfinger hits for 3 minutes	4 years ago
Claire	37fd9670a5	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	63b807cffc	Fix serialization of followers/following counts when user hides their network (#16418) ... * Add tests * Fix serialization of followers/following counts when user hides their network Fixes #16382 Signed-off-by: Claire <claire.github-309c@sitedethib.com>	4 years ago
Claire	fbf097f7e1	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	1294f9ee4f	Remove PubSubHubbub-related columns from accounts table (#16170)	4 years ago
Claire	50b430d9a2	Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.	4 years ago
Claire	566fc90913	Add Ruby 3.0 support (#16046) ... * Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0 Also improve the Terrapin monkey-patch for the stderr/stdout issue. * Fix keyword argument handling throughout the codebase * Monkey-patch Paperclip to fix keyword arguments handling in validators * Change validation_extensions to please CodeClimate * Bump microformats from 4.2.1 to 4.3.1 * Allow Ruby 3.0 * Add Ruby 3.0 test target to CircleCI * Add test for admin dashboard warnings * Fix admin dashboard warnings on Ruby 3.0	4 years ago
Claire	8c44b723bb	Change confirmations controller to redirect to / for approved users (#16151) ... Clicking the confirmation link multiple times currently leads to entering account settings, which can be confusing. This commit changes that so that it redirects to the root path, so it behaves the same way as clicking only once in most cases.	4 years ago
Claire	e2a2bc9021	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.	4 years ago
Eugen Rochko	3b8d085436	Fix app name, website and redirect URIs not having a maximum length (#16042) ... Fix app scopes not being validated	4 years ago
Eugen Rochko	ce2148c571	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040) ... With possible values `all`, `followed`, `follower`, and `none`, control from whom notifications will generate a Web Push alert	4 years ago
Claire	5c225b03db	Fix glitch-soc-specific health check spec	4 years ago
Claire	15efa32cca	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	a650a1157d	Fix /admin/tags/:id crashing since Rails 6.1 update (#15953) ... Raw SQL passed to `pluck` now has to be explicitly marked as SQL via Arel.sql, see https://github.com/rails/rails/pull/27947	4 years ago
Claire	f60c99a8fb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	cbd0ee1d07	Update Mastodon to Rails 6.1 (#15910) ... * Update devise-two-factor to unreleased fork for Rails 6 support Update tests to match new `rotp` version. * Update nsa gem to unreleased fork for Rails 6 support * Update rails to 6.1.3 and rails-i18n to 6.0 * Update to unreleased fork of pluck_each for Ruby 6 support * Run "rails app:update" * Add missing ActiveStorage config file * Use config.ssl_options instead of removed ApplicationController#force_ssl Disabled force_ssl-related tests as they do not seem to be easily testable anymore. * Fix nonce directives by removing Rails 5 specific monkey-patching * Fix fixture_file_upload deprecation warning * Fix yield-based test failing with Rails 6 * Use Rails 6's index_with when possible * Use ActiveRecord::Cache::Store#delete_multi from Rails 6 This will yield better performances when deleting an account * Disable Rails 6.1's automatic preload link headers Since Rails 6.1, ActionView adds preload links for javascript files in the Links header per default. In our case, that will bloat headers too much and potentially cause issues with reverse proxies. Furhermore, we don't need those links, as we already output them as HTML link tags. * Switch to Rails 6.0 default config * Switch to Rails 6.1 default config * Do not include autoload paths in the load path	4 years ago
Claire	3ad6ef72cb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	5027abecd1	Fix cache_collection crashing when given an empty collection (#15921) ... * Fix cache_collection crashing when given an empty collection * Add tests	4 years ago
Claire	43eff898a0	Prepare Mastodon for Rails 6 (#15911) ... * Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage	4 years ago
Claire	d8fdbb054e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.	4 years ago
Eugen Rochko	9aa37b32c3	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
Claire	5f4c0b79c2	Change ResolveAccountService's handling of skip_webfinger (#15750) ... * Change ResolveAccountService's handling of skip_webfinger Change it so it never makes any webfinger query, as the name would imply. * Add tests * Change FollowService to not take an URI for target_account * Restore domain-block check in FollowService * Fix tests	4 years ago
Claire	4d40685850	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
ThibG	a044ddac5b	Fix race conditions on account migration creation (#15597) ... * Atomically check for processing lock in Move handler * Prevent race condition when creating account migrations Fixes #15595 * Add tests Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 years ago
abcang	7ab53f221a	Improved performance of notification preloading (#15640) ... * Improved performance of notification preloading * Remove Cacheable from Notification * Fix test	4 years ago
Claire	33d30632fb	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.	4 years ago
Levi Bard	11d603101a	Fix muting users with duration via the REST api (#15516)	4 years ago
Claire	537afa00f3	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.	4 years ago
ThibG	1cf2c3a810	Fix external user creation failing when invite request text is required (#15405) ... * Fix external user creation failing when invite request text is required Also fixes tootctl-based user creation. * Add test about invites when invite request text is otherwise required Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 years ago
Claire	e4f8679eae	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.	4 years ago
Eugen Rochko	216b85b053	Fix performance on instances list in admin UI (#15282) ... - Reduce duplicate queries - Remove n+1 queries - Add accounts count to detailed view - Add separate action log entry for updating existing domain blocks	4 years ago
Claire	7782e4dc0d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.	4 years ago
ThibG	49eb4d4ddf	Add honeypot fields and minimum fill-out time for sign-up form (#15276) ... * Add honeypot fields to limit non-specialized spam Add two honeypot fields: a fake website input and a fake password confirmation one. The label/placeholder/aria-label tells not to fill them, and they are hidden in CSS, so legitimate users should not fall into these. This should cut down on some non-Mastodon-specific spambots. * Require a 3 seconds delay before submitting the registration form * Fix tests * Move registration form time check to model validation * Give people a chance to clear the honeypot fields * Refactor honeypot translation strings Co-authored-by: Claire <claire.github-309c@sitedethib.com>	4 years ago
Thibaut Girka	e71b16ae2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.	4 years ago