Claire
8f91e304a5
Fix spurious edits and require incoming edits to be explicitly marked as 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-06 21:01:02 +02:00
Claire
82375bdb7c
Fix error when encountering invalid pinned posts ( #17964 )
2022-04-06 20:58:23 +02:00
Claire
454ef42aab
Fix error when encountering invalid pinned posts ( #17964 )
2022-04-06 20:58:23 +02:00
Eugen Rochko
f982d56b4e
Remove sign-in token authentication, instead send e-mail about new sign-in ( #17970 )
2022-04-06 20:58:12 +02:00
Eugen Rochko
6221b36b27
Remove sign-in token authentication, instead send e-mail about new sign-in ( #17970 )
2022-04-06 20:58:12 +02:00
Claire
7790624ca4
Fix inconsistency in error handling when removing a status ( #17974 )
...
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-06 20:57:52 +02:00
Claire
abb11778d7
Fix inconsistency in error handling when removing a status ( #17974 )
...
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-06 20:57:52 +02:00
Claire
0e3717eb2d
Fix admin API unconditionally requiring CSRF token ( #17975 )
...
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-06 20:57:18 +02:00
Claire
62c6e12fa5
Fix admin API unconditionally requiring CSRF token ( #17975 )
...
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-06 20:57:18 +02:00
Eugen Rochko
89268074e7
Fix GET /api/v1/trends/tags missing offset param in REST API ( #17973 )
2022-04-06 20:56:57 +02:00
Eugen Rochko
d116cb7733
Fix GET /api/v1/trends/tags missing offset param in REST API ( #17973 )
2022-04-06 20:56:57 +02:00
Claire
300645b844
Merge pull request #1733 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-04-06 17:13:26 +02:00
Claire
00c9363f07
Merge pull request #1733 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-04-06 17:13:26 +02:00
CommanderRoot
368f6ac07a
[Glitch] Replace deprecated String.prototype.substr()
...
Port 07f1888854
2022-04-06 16:08:33 +02:00
CommanderRoot
9b95077885
[Glitch] Replace deprecated String.prototype.substr()
...
Port 0ec695e036
2022-04-06 16:08:33 +02:00
Claire
77a8515b59
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-06 16:06:15 +02:00
Claire
c02644ef10
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-06 16:06:15 +02:00
dependabot[bot]
c720b36d97
Bump sass from 1.49.9 to 1.49.11 ( #17959 )
...
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-06 03:03:45 +09:00
dependabot[bot]
04b4b541f8
Bump sass from 1.49.9 to 1.49.11 ( #17959 )
...
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-06 03:03:45 +09:00
dependabot[bot]
563f53a823
Bump prettier from 2.6.1 to 2.6.2 ( #17958 )
...
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-06 03:03:26 +09:00
dependabot[bot]
5e49cb8f0f
Bump prettier from 2.6.1 to 2.6.2 ( #17958 )
...
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-06 03:03:26 +09:00
dependabot[bot]
c961a079a5
Bump redis from 4.0.4 to 4.0.6 ( #17957 )
...
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-06 03:03:13 +09:00
dependabot[bot]
76f7759ecb
Bump redis from 4.0.4 to 4.0.6 ( #17957 )
...
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-06 03:03:13 +09:00
dependabot[bot]
88a228f7da
Bump sidekiq-unique-jobs from 7.1.15 to 7.1.16 ( #17956 )
...
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-06 03:02:51 +09:00
dependabot[bot]
c35ef5cb49
Bump sidekiq-unique-jobs from 7.1.15 to 7.1.16 ( #17956 )
...
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-06 03:02:51 +09:00
dependabot[bot]
58f5a39cfd
Bump react-redux from 7.2.6 to 7.2.8 ( #17955 )
...
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-06 03:02:35 +09:00
dependabot[bot]
bf29651fe3
Bump react-redux from 7.2.6 to 7.2.8 ( #17955 )
...
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-06 03:02:35 +09:00
dependabot[bot]
631c0faec4
Bump ox from 2.14.10 to 2.14.11 ( #17954 )
...
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-06 03:02:07 +09:00
dependabot[bot]
b15b41cb2c
Bump ox from 2.14.10 to 2.14.11 ( #17954 )
...
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-06 03:02:07 +09:00
dependabot[bot]
2c41e65c6a
Bump pg from 1.3.4 to 1.3.5 ( #17953 )
...
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-06 03:01:48 +09:00
dependabot[bot]
95256f26f5
Bump pg from 1.3.4 to 1.3.5 ( #17953 )
...
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-06 03:01:48 +09:00
rinsuki
a4fa33f2be
fix: returns nil instead of empty URL on status.application.website ( #17962 )
2022-04-05 12:00:31 +02:00
rinsuki
275dad9702
fix: returns nil instead of empty URL on status.application.website ( #17962 )
2022-04-05 12:00:31 +02:00
Claire
1f82304f6f
Merge pull request #1732 from OrichalcumCosmonaut/main
...
fix typo in `<sub>` CSS styles
2022-04-05 09:44:09 +02:00
Claire
f0c0787789
Merge pull request #1732 from OrichalcumCosmonaut/main
...
fix typo in `<sub>` CSS styles
2022-04-05 09:44:09 +02:00
quinn
3b3741df6f
Update composer.scss
2022-04-05 17:35:50 +10:00
quinn
a73806ea32
Update composer.scss
2022-04-05 17:35:50 +10:00
quinn
92d2f50065
Update status.scss
2022-04-05 17:17:00 +10:00
quinn
1f0ff1ea98
Update status.scss
2022-04-05 17:17:00 +10:00
quinn
038d7b7be0
Update composer.scss
2022-04-05 17:16:21 +10:00
quinn
e989147a91
Update composer.scss
2022-04-05 17:16:21 +10:00
Claire
bb0a1e3ec0
Merge pull request #1731 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-04-04 18:42:43 +02:00
Claire
393db67ecc
Merge pull request #1731 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-04-04 18:42:43 +02:00
CommanderRoot
07f1888854
Replace deprecated String.prototype.substr() ( #17949 )
...
* 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-04 12:19:45 -04:00
CommanderRoot
0ec695e036
Replace deprecated String.prototype.substr() ( #17949 )
...
* 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-04 12:19:45 -04:00
Claire
d18363b5db
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-04 17:25:57 +02:00
Claire
d01c5b0b8c
Merge branch 'main' into glitch-soc/merge-upstream
2022-04-04 17:25:57 +02:00
Ondřej Pokorný
c3eacaecfe
Update en.yml ( #17942 )
...
typo
2022-04-03 14:02:29 +02:00
Ondřej Pokorný
80ded02a4b
Update en.yml ( #17942 )
...
typo
2022-04-03 14:02:29 +02:00
Claire
4001f3810c
Fix unusual number formatting in some locales ( #17929 )
...
* Fix unusual number formatting in some locales
Fixes #17904
* Fix typo
2022-04-01 23:59:13 +02:00
