about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-04-07Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-04-07Fix failure when sending warning emails with custom text (#17983)Claire
* Add tests * Fix failure when sending warning emails with custom text
2022-04-07Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send ↵Eugen Rochko
(#17982)
2022-04-07Fix older items possibly disappearing on timeline updates (#17980)Claire
In some rare cases, when receiving statuses out of order from the streaming API then polling from the REST API, it was possible for the `expandNormalizedTimeline` function to remove older items from the timeline. This commit ensures that any item from the replaced slice that is older than the oldest item retrieved from the API gets added back to the replaced slice.
2022-04-06Add pagination for trending statuses in web UI (#17976)Eugen Rochko
2022-04-06[Glitch] Fix possible duplicate statuses in timelines in some edge casesClaire
Port dd4c156f33a24b8bb89b45b2697aa4036c3ae5be to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-04-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.
2022-04-06Fix possible duplicate statuses in timelines in some edge cases (#17971)Claire
In some rare cases, when receiving statuses out of order from the streaming API then polling from the REST API, it was possible for the `expandNormalizedTimeline` function to insert duplicates in the timeline, which would then result in several bugs. This commits ensures that there are no duplicates inserted in the timeline.
2022-04-06Fix spurious edits and require incoming edits to be explicitly marked as ↵Claire
such (#17918) * Change post text edit to not be considered significant if it's identical after reformatting * We don't need to clear previous change information anymore * Require status edits to be explicit, except for poll tallies * Fix tests * Add some tests * Add poll-related tests * Add HTML-formatting related tests
2022-04-06Fix error when encountering invalid pinned posts (#17964)Claire
2022-04-06Remove sign-in token authentication, instead send e-mail about new sign-in ↵Eugen Rochko
(#17970)
2022-04-06Fix inconsistency in error handling when removing a status (#17974)Claire
Not completely sure this could actually have any ill effect, but if `RemoveStatusService` fails to acquire a lock in an `ActivityPub::ProcessingWorker` job processing a `Delete`, the status is currently discarded and causes a job failure but the next time the job is attempted, it will skip deleting the status due to it being discarded. This commit makes the behavior of `RemoveStatusService` a bit more consistent in case of failure to acquire the lock.
2022-04-06Fix admin API unconditionally requiring CSRF token (#17975)Claire
Fixes #17898 Since #17204, the admin API has only been available through the web application because of the unconditional requirement to provide a valid CSRF token. This commit changes it back to `null_session`, which should make it work both with session-based authentication (provided a CSRF token) and with a bearer token.
2022-04-06Fix `GET /api/v1/trends/tags` missing `offset` param in REST API (#17973)Eugen Rochko
2022-04-06Merge pull request #1733 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-04-06[Glitch] Replace deprecated String.prototype.substr()CommanderRoot
Port 0ec695e036dab45d57598f451266bd0b176df9fd to glitch-soc Signed-off-by: Tobias Speicher <rootcommander@gmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-04-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-04-06Bump sass from 1.49.9 to 1.49.11 (#17959)dependabot[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.49.9 to 1.49.11. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.49.9...1.49.11) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump prettier from 2.6.1 to 2.6.2 (#17958)dependabot[bot]
Bumps [prettier](https://github.com/prettier/prettier) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.6.1...2.6.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump redis from 4.0.4 to 4.0.6 (#17957)dependabot[bot]
Bumps [redis](https://github.com/redis/node-redis) from 4.0.4 to 4.0.6. - [Release notes](https://github.com/redis/node-redis/releases) - [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/node-redis/compare/redis@4.0.4...redis@4.0.6) --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump sidekiq-unique-jobs from 7.1.15 to 7.1.16 (#17956)dependabot[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.15 to 7.1.16. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.15...v7.1.16) --- updated-dependencies: - dependency-name: sidekiq-unique-jobs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump react-redux from 7.2.6 to 7.2.8 (#17955)dependabot[bot]
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.6 to 7.2.8. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.6...v7.2.8) --- updated-dependencies: - dependency-name: react-redux dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump ox from 2.14.10 to 2.14.11 (#17954)dependabot[bot]
Bumps [ox](https://github.com/ohler55/ox) from 2.14.10 to 2.14.11. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.14.10...v2.14.11) --- updated-dependencies: - dependency-name: ox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06Bump pg from 1.3.4 to 1.3.5 (#17953)dependabot[bot]
Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/commits) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-05fix: returns nil instead of empty URL on status.application.website (#17962)rinsuki
2022-04-05Merge pull request #1732 from OrichalcumCosmonaut/mainClaire
fix typo in `<sub>` CSS styles
2022-04-05Update composer.scssquinn
2022-04-05Update status.scssquinn
2022-04-05Update composer.scssquinn
2022-04-04Merge pull request #1731 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-04-04Replace deprecated String.prototype.substr() (#17949)CommanderRoot
* Replace deprecated String.prototype.substr() .substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated * Change String.prototype.substring() to String.prototype.slice() .substring() and .slice() work very similary but .slice() is a bit faster and stricter * Add ESLint rule to forbid usage of .substr and .substring .substr() is deprecated and .substring() is very similar to .slice() so better to use .slice() at all times Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-04-04Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-04-03Update en.yml (#17942)Ondřej Pokorný
typo
2022-04-01Fix unusual number formatting in some locales (#17929)Claire
* Fix unusual number formatting in some locales Fixes #17904 * Fix typo
2022-04-01fix: `s3_force_single_request` not parsed (#17922)Holger
2022-04-01Fix assets failing to build with OpenSSL 3 because of deprecated hash ↵Claire
algorithm (#17930) Fixes #17924
2022-03-31Bump puma from 5.6.2 to 5.6.4 (#17914)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-31fix: PWA web manifest not changed to new routes (#17921)Holger
2022-03-31Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-03-31Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912)Claire
Also refactor a bit to reduce code duplication.
2022-03-30Merge pull request #1726 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-03-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-03-30Merge pull request #1725 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-03-30Bump version to 3.5.0 (#17911)Eugen Rochko
2022-03-30Fix being able to post URLs longer than 4096 characters (#17908)Eugen Rochko
2022-03-30Fix being able to bypass e-mail restrictions (#17909)Eugen Rochko
2022-03-30Revert "Split build image actions (#17793)" (#17907)Eugen Rochko
This reverts commit 22eeaf2645e44ea800a6e4c4acb7bf9d72211344.
2022-03-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-03-30Refactor `response_to_recipient?` CTE (#17899)Claire
* Optimize and clean up `response_to_recipient?` CTE Marginally improve performances, and make the CTE much more readable * Limit max depth in `response_to_recipient?` CTE
generated by cgit-pink (git 2.37.1) at 2024-12-26 17:49:20 +0000