eef8a1a3f2
Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
f808214a8f
[Glitch] Improve hover and focus style in columns settings
...
Port 6f00276f06
3 years ago
377a18effd
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
10918d97d4
Fix media attachment size validation not correctly accounting for file type ( #16819 )
...
* Fix media attachment size validation not correctly accounting for file type
Fixes a regression introduced in #16724 caused by the fact that kt-paperclip
now correctly runs validations before processing, meaning that file size
verification could not rely on our before_post_processing hook.
Moved the `before_post_processing` hooks to `before_validate` to make sure
the media attachment type is set correctly before the file gets validated.
* Add tests
3 years ago
6f00276f06
Improve hover and focus style in columns settings ( #16222 )
...
* Make focus visible on switches and text buttons in columns settings
* Make hover/focus visible on left/right arrows in columns settings
Use same style as for station action bar (reply/boost/fav/etc.)
* Tab first to “Pin/Unpin” before left/right arrows in columns settings
3 years ago
9fcd06c289
Fix clicking on account name in “[xxx] boosted” text leading to broken path
3 years ago
c1ede11c0f
Merge pull request #1613 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
36fc7dd7d1
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
1dbc4a8611
Fix webauthn secure key authentication ( #16792 )
...
* Add tests
* Fix webauthn secure key authentication
Fixes #16769
3 years ago
9dd04c3f19
Fix drawer tab menu routes in advanced web ui ( #16793 )
3 years ago
ac57efdbee
Bump bufferutil from 4.0.3 to 4.0.4 ( #16783 )
...
Bumps [bufferutil](https://github.com/websockets/bufferutil ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/websockets/bufferutil/releases )
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.3...v4.0.4 )
---
updated-dependencies:
- dependency-name: bufferutil
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>
3 years ago
563d1350a6
Bump jest from 27.2.0 to 27.2.3 ( #16795 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.2.0 to 27.2.3.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.2.0...v27.2.3 )
---
updated-dependencies:
- dependency-name: jest
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>
3 years ago
d83a81ba09
Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
1af4ef2859
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
Slight refactor upstream, next to a line that was different in glitch-soc
because of our local configurable limits on custom emoji size.
Ported upstream changes.
- `yarn.lock`:
Not really a conflict, upstream dependency textually too close to a
glitch-soc-only dependency.
Updated upstream dependency as upstream.
3 years ago
7d0089033f
Switch from unmaintained paperclip to kt-paperclip ( #16724 )
...
* Switch from unmaintained paperclip to kt-paperclip
* Drop some compatibility monkey-patches not required by kt-paperclip
* Drop media spoof check monkey-patching
It's broken with kt-paperclip and hopefully it won't be needed anymore
* Fix regression introduced by paperclip 6.1.0
* Do not rely on pathname to call FastImage
* Add test for ogg vorbis file with cover art
* Add audio/vorbis to the accepted content-types
This seems erroneous as this would be the content-type for a vorbis stream
without an ogg container, but that's what the `marcel` gem outputs, so…
* Restore missing for_as_default method
* Refactor Attachmentable concern and delay Paperclip's content-type spoof check
Check for content-type spoofing *after* setting the extension ourselves, this
fixes a regression with kt-paperclip's validations being more strict than
paperclip 6.0.0 and rejecting some Pleroma uploads because of unknown
extensions.
* Please CodeClimate
* Add audio/vorbis to the unreliable set
It doesn't correspond to a file format and thus has no extension associated.
3 years ago
266a67121b
Bump aws-sdk-s3 from 1.102.0 to 1.103.0 ( #16756 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.102.0 to 1.103.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
dc14cbf4ec
Bump bootsnap from 1.8.1 to 1.9.1 ( #16759 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.8.1 to 1.9.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.8.1...v1.9.1 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
4ea1efb79e
Bump eslint-plugin-react from 7.25.1 to 7.26.0 ( #16784 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.25.1 to 7.26.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.25.1...v7.26.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
74ceb5f447
Bump parallel_tests from 3.7.1 to 3.7.3 ( #16754 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.7.1 to 3.7.3.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.7.1...v3.7.3 )
---
updated-dependencies:
- dependency-name: parallel_tests
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>
3 years ago
324ffbdaa5
Bump webpacker from 5.4.2 to 5.4.3 ( #16757 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v5.4.2...v5.4.3 )
---
updated-dependencies:
- dependency-name: webpacker
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>
3 years ago
0a72ba3933
Bump nokogiri from 1.12.4 to 1.12.5 ( #16775 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5 )
---
updated-dependencies:
- dependency-name: nokogiri
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>
3 years ago
4289ab2b07
Bump tzinfo-data from 1.2021.1 to 1.2021.2 ( #16776 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2021.1 to 1.2021.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.1...v1.2021.2 )
---
updated-dependencies:
- dependency-name: tzinfo-data
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>
3 years ago
65bb2d062e
Bump sidekiq-unique-jobs from 7.1.5 to 7.1.7 ( #16777 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.5 to 7.1.7.
- [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.5...v7.1.7 )
---
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>
3 years ago
cadd20d67f
Bump doorkeeper from 5.5.2 to 5.5.3 ( #16778 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.2...v5.5.3 )
---
updated-dependencies:
- dependency-name: doorkeeper
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>
3 years ago
7e1a3f3576
Bump json-ld from 3.1.9 to 3.1.10 ( #16779 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.9...3.1.10 )
---
updated-dependencies:
- dependency-name: json-ld
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>
3 years ago
1c9820c732
Bump glob from 7.1.7 to 7.2.0 ( #16782 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.7 to 7.2.0.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.7...v7.2.0 )
---
updated-dependencies:
- dependency-name: glob
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8ab62c1b5d
Bump autoprefixer from 9.8.6 to 9.8.7 ( #16785 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.8.6 to 9.8.7.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/9.8.7/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.6...9.8.7 )
---
updated-dependencies:
- dependency-name: autoprefixer
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>
3 years ago
2095a47418
Bump utf-8-validate from 5.0.5 to 5.0.6 ( #16786 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.5...v5.0.6 )
---
updated-dependencies:
- dependency-name: utf-8-validate
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>
3 years ago
ac307a8b8f
Bump babel-jest from 27.2.0 to 27.2.2 ( #16787 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.2.0 to 27.2.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.2.2/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
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>
3 years ago
35fd840fd2
Bump @testing-library/react from 12.1.0 to 12.1.1 ( #16788 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.0 to 12.1.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.0...v12.1.1 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
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>
3 years ago
e2dfa99044
Bump yargs from 17.1.1 to 17.2.1 ( #16790 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 17.1.1 to 17.2.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v17.1.1...v17.2.1 )
---
updated-dependencies:
- dependency-name: yargs
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
0a75480eb5
Merge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
e8a7f34442
Fixup style issue
3 years ago
02e245bd88
[Glitch] Fix incorrect use of old WebUI paths
...
Port 8cfa8908eb
3 years ago
a4562d8b00
[Glitch] Add aliases for WebUI routes that were renamed in #16171
...
Port 1de7061d5e
3 years ago
32dd0ca48f
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
8cfa8908eb
Fix incorrect use of old WebUI paths ( #16773 )
...
* Fix incorrect use of old WebUI paths
PR #16171 renamed some routes but missed some occurrences.
Without #16772 , this leads to unreachable routes in those cases.
* Fix floating action button being displayed on statuses and compose screen
3 years ago
1de7061d5e
Add aliases for WebUI routes that were renamed in #16171 ( #16772 )
...
* Add aliases for some WebUI routes that were renamed in #16171
Accounts and statuses routes need more work as they use different parameters.
* Add aliases for /statuses/* routes
* Add aliases for /accounts/* WebUI routes
Does not correctly set the “active” state on the navigation tabs but this is
a minor issue.
* Fix some routes
* Fix /accounts/:id/{media,followers,following} not loading on legacy routes
3 years ago
e28fcc78ee
[Glitch] Change routing paths to use usernames in web UI
...
Port ce84967ee4
3 years ago
231787710a
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.
3 years ago
4752c0a8d3
Refactor notifications to go through a separate stream in streaming API ( #16765 )
...
Eliminate need to have custom notifications filtering logic in the
streaming API code by publishing notifications into a separate stream
and then simply using the multi-stream capability to subscribe to that
stream when necessary
3 years ago
ce84967ee4
Change routing paths to use usernames in web UI ( #16171 )
3 years ago
b456f67d77
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
572c736ca8
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
3d9c2a04ae
Bump tmpl from 1.0.4 to 1.0.5 ( #16762 )
...
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl ) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases )
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5 )
---
updated-dependencies:
- dependency-name: tmpl
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
b98417806e
helm: set default SMTP_CA_FILE ( #16750 )
...
https://github.com/mastodon/mastodon/pull/10857
3 years ago
f5e11605ec
Merge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
d763745729
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
4f20670d70
Bump babel-jest from 27.1.0 to 27.2.0 ( #16738 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.1.0 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.2.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
e0bd1ccfda
Bump oj from 3.13.4 to 3.13.7 ( #16751 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.4 to 3.13.7.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.4...v3.13.7 )
---
updated-dependencies:
- dependency-name: oj
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>
3 years ago
Claire
Mélanie Chauvel
Mashiro
dependabot[bot]
Eugen Rochko
Alexandra Catalina