1443 Commits (0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200)

Author	SHA1	Message	Date
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	6 years ago
ThibG	89f40b6c3e	Make domain block/silence/reject-media code more robust (#13424) ... * Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.	6 years ago
Eugen Rochko	72a7cfaa39	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	6 years ago
ThibG	aed3a436a2	Fix serialization of replies when some of them are URIs (#13957) ... * Fix serialization of replies when some of them are URIs Fixes #13956 * Add test	6 years ago
Eugen Rochko	5d8398c8b8	Add E2EE API (#13820)	6 years ago
Ben Lubar	ead09f5ddc	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334) ... * fix exception when trying to serialize posts with <a> tags in them without hrefs * Add tests Co-authored-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Thibaut Girka	27b5143dc4	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	a319c1e60f	Add support for `summary` field for media description (#13763)	6 years ago
ThibG	27ea7c13a5	Fix hashtag search performing account search as well (#13758)	6 years ago
ThibG	71fce71c94	Fix webfinger returning wrong status code on malformed or missing param (#13759) ... Fixes #13757	6 years ago
Thibaut Girka	3baacf6993	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot-preview[bot]	78202e9138	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) ... * Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
ThibG	4bcef12bad	Fix sr locale being selected over sr-Latn (#13693) ... * Fix sr locale being selected over sr-Latn * Update tests	6 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	6 years ago
Eugen Rochko	4b766f9846	Refactor monkey-patching of Goldfinger (#12561)	6 years ago
Eugen Rochko	8be4c2ba21	Add ability to remove identity proofs from account (#13682) ... Fix #12613	6 years ago
Takeshi Umeda	26b08a3c54	Add remote only to public timeline (#13504) ... * Add remote only to public timeline * Fix code style	6 years ago
ThibG	a4240fd027	Improve RSS entries for statuses (#13592) ... * Improve RSS entries for statuses - Render polls in both accounts and tags serializers - Refactor RSS serializers - Change title preview to include ellipsis when truncated - Change title preview to show CW instead of toot text - Add tests * Remove title from OEmbed serialization Twitter doesn't serialize title either, and tihs allows us to move the title formatting code to the RSS serializers.	6 years ago
ThibG	f1e0fa80f6	Fix own following/followers not showing muted users (#13614) ... Fixes #13612	6 years ago
Taras Gogol	6748a5acb1	Fix followings list order | Issue #13538 (#13676)	6 years ago
Eugen Rochko	5cff7910c2	Add more ActivityPub controller tests (#13590)	6 years ago
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	6 years ago
Yamagishi Kazutoshi	e223fd8c61	Revert "improve status title (#8596)" (#13591) ... This reverts commit 05756c9a14.	6 years ago
Eugen Rochko	988b0493fe	Add more tests for ActivityPub controllers (#13585)	6 years ago
Eugen Rochko	2744f61696	Fix not being able to resolve public resources in development environment (#13505)	6 years ago
Thibaut Girka	81e49ba5c6	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	5edff32733	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	6 years ago
Thibaut Girka	8fef96cbf5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	f65568f1d4	Add ability to filter audit log in admin UI (#13381)	6 years ago
Thibaut Girka	f3eff922a3	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	6 years ago
Eugen Rochko	9014367bd8	Fix background jobs not using locks like they are supposed to (#13361) ... Also: - Fix locks not being removed when jobs go to the dead job queue - Add UI for managing locks to the Sidekiq dashboard - Remove unused Sidekiq workers Fix #13349	6 years ago
Thibaut Girka	7b435fd9bf	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	6 years ago
ThibG	f08f880f58	Fix media not being marked sensitive when client sets a CW but no text (#13277) ... Mastodon enforces the “sensitive” flag on media attachments whenever a toot is posted with a Content Warning. However, it does so *after* potentially converting the Content Warning to toot text (when there is no toot text), which leads to inconsistent and surprising behavior for API clients. This commit fixes this inconsistency.	6 years ago
Thibaut Girka	02f1c04fab	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	6 years ago
Thibaut Girka	2c510ee00a	Fix glitch-soc marking every link in toots as a tag ... Fixes #1281	6 years ago
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	6 years ago
dependabot-preview[bot]	56531d646e	Bump sidekiq from 5.2.7 to 6.0.4 (#11727) ... * Bump sidekiq from 5.2.7 to 6.0.0 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Sidekiq::Logger.logger -> Sidekiq.logger * Drop support Ruby 2.4 * update Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	6 years ago
ThibG	61f35c1a8a	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	6 years ago
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	6 years ago
guigeekz	e31ba618d4	Add submit button to the top of preferences pages (#13068) ... * Move submit button to the top of the edit page * Duplicate save button on long form * Fix click submit on profile spec	6 years ago
Eugen Rochko	339ce1c4e9	Add specific rate limits for posting and following (#13172)	6 years ago
Thibaut Girka	51d326f852	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	0c28a505dd	Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)	6 years ago
Thibaut Girka	e037002401	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	c48d895ea7	Fix sign-ups without checked user agreement being accepted through the web form (#13088) ... * Fix user agreement not being verified * Fix tests * Fix up agreement field being dismissed	6 years ago
Thibaut Girka	0cbd6d696b	Add test for health_check endpoint	6 years ago
Thibaut Girka	432033743c	Fix tests ... Well, kinda, it's actually a bug from glitch-soc, but we will have to address it separately.	6 years ago
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	6 years ago
Eugen Rochko	b1349342d2	Fix rendering `<a>` without `href` when scheme unsupported (#13040) ... - Disallow links with relative paths - Disallow iframes with non-http protocols and relative paths Close #13037	6 years ago
Thibaut Girka	1a54b9b99e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago