queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
15120 commits 2 branches 0 tags 215 MiB
Commit graph

15120 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream 
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-06 21:10:23 +02:00
Claire dd4c156f33
Fix possible duplicate statuses in timelines in some edge cases (#17971) 
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-06 21:01:41 +02:00
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 454ef42aab
Fix error when encountering invalid pinned posts (#17964) 2022-04-06 20:58:23 +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 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 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 d116cb7733
Fix GET /api/v1/trends/tags missing offset param in REST API (#17973) 2022-04-06 20:56:57 +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 9b95077885 [Glitch] Replace deprecated String.prototype.substr() 
Port 0ec695e036 to glitch-soc

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-04-06 16:08:33 +02:00
Claire c02644ef10 Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 16:06:15 +02: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] 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] 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] 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] 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] 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] 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 275dad9702
fix: returns nil instead of empty URL on status.application.website (#17962) 2022-04-05 12:00:31 +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 a73806ea32
Update composer.scss 2022-04-05 17:35:50 +10:00
quinn 1f0ff1ea98
Update status.scss 2022-04-05 17:17:00 +10:00
quinn e989147a91
Update composer.scss 2022-04-05 17:16:21 +10: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 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 d01c5b0b8c Merge branch 'main' into glitch-soc/merge-upstream 2022-04-04 17:25:57 +02:00
Ondřej Pokorný 80ded02a4b
Update en.yml (#17942) 
typo
 2022-04-03 14:02:29 +02:00
Claire 0a8a0fb599
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
Holger 39b489ba4c
fix: s3_force_single_request not parsed (#17922) 2022-04-01 23:56:23 +02:00
Claire 44b7be45f1
Fix assets failing to build with OpenSSL 3 because of deprecated hash algorithm (#17930) 
Fixes #17924
 2022-04-01 23:55:32 +02:00
dependabot[bot] 24d446adf2
Bump puma from 5.6.2 to 5.6.4 (#17914) 
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-31 19:10:40 +09:00
Holger ea0cfd8e7e
fix: PWA web manifest not changed to new routes (#17921) 2022-03-31 11:20:26 +02:00
Claire 3381a0e6e0
Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-03-31 10:42:51 +02:00
Claire 6bdec0aec9 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-31 10:36:23 +02:00
Claire ef196c913c
Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912) 
Also refactor a bit to reduce code duplication.
 2022-03-31 00:49:24 +02:00
Claire 363773d0e9
Merge pull request #1726 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-03-30 18:28:07 +02:00
Claire fc5dd0c538 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 15:02:56 +02:00
Claire 60f9973f45
Merge pull request #1725 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-03-30 15:02:16 +02:00
Eugen Rochko 8c7223f4ea
Bump version to 3.5.0 (#17911) 2022-03-30 14:52:37 +02:00
Eugen Rochko bbc7afa2a2
Fix being able to post URLs longer than 4096 characters (#17908) 2022-03-30 14:46:03 +02:00
Eugen Rochko 5554ff2a1d
Fix being able to bypass e-mail restrictions (#17909) 2022-03-30 14:45:52 +02:00
Eugen Rochko 607ce67e05
Revert "Split build image actions (#17793)" (#17907) 
This reverts commit 22eeaf2645.
 2022-03-30 14:34:53 +02:00
Claire 51a297e128 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 13:40:10 +02:00
Claire 2cc7ba2671
Refactor response_to_recipient? CTE (#17899) 
* 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
 2022-03-30 10:26:51 +02:00
Claire 2de5128e66
Fix regression of status colors in actions modal in web UI (#17903) 
Fixes #17900

Regression in #17844 (#17851 restored the code in the wrong place…)
 2022-03-29 22:55:37 +02:00
Yurii Izorkin cc9cd25d30
caniuse-lite: add hash sum (#17902) 2022-03-29 22:16:59 +02:00
Claire eaea849035
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-03-29 16:39:43 +02:00
dependabot[bot] 22c19eefb1
Bump rubocop from 1.26.0 to 1.26.1 (#17891) 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.26.0...v1.26.1)

---
updated-dependencies:
- dependency-name: rubocop
  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-03-29 18:58:28 +09:00
dependabot[bot] 5b83733d32
Bump capistrano from 3.16.0 to 3.17.0 (#17774) 
* Bump capistrano from 3.16.0 to 3.17.0

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.16.0 to 3.17.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.16.0...v3.17.0)

---
updated-dependencies:
- dependency-name: capistrano
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* 3.17.0

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-03-29 18:49:00 +09:00
dependabot[bot] 64e087e0c3
Bump concurrent-ruby from 1.1.9 to 1.1.10 (#17889) 
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.9 to 1.1.10.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.9...v1.1.10)

---
updated-dependencies:
- dependency-name: concurrent-ruby
  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-03-29 17:53:21 +09:00