b81710c02c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Not a real conflict, glitch-soc quotes the upstream file, which has been
changed. Update the quote.
3 years ago
7f1c56954b
Fix first return value of FetchLinkCardService.html method ( #15630 )
3 years ago
4f05a43f8f
Fix link to documentation repo ( #15620 )
3 years ago
3ca089d4d7
Bump makara from 0.4.1 to 0.5.0 ( #15578 )
...
Bumps [makara](https://github.com/taskrabbit/makara ) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/taskrabbit/makara/releases )
- [Changelog](https://github.com/instacart/makara/blob/master/CHANGELOG.md )
- [Commits](https://github.com/taskrabbit/makara/compare/v0.4.1...v0.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
7ea9588520
Use Enumerable#filter_map in more places ( #15527 )
3 years ago
bc4efd5e98
Use libvpx >= 5 ( #15591 )
...
Ubuntu 18.04 provides libvpx5 while Ubuntu 20.04 does libvpx6
3 years ago
5fcac81302
Add “translate” class to other user strings ( #15611 )
...
* Add “translate” class to other user strings
Follow-up to #15610 .
Allow Google Translate to work on more user content:
- poll options
- reply indicator (contents of the status being replied to)
- directory account cards
- account note in follow requests list
* Fix incorrect styling of account bio
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
eb51e43fb4
Optimize some regex matching ( #15528 )
...
* Use Regex#match?
* Replace =~ too
* Avoid to call match? from Nil
* Keep value of Regexp.last_match
3 years ago
d1255ab8a5
Merge pull request #1487 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
c48e2a48ba
[Glitch] Fix Google Translate breaking web interface
...
Port 7d0031a515
3 years ago
f90fa11db5
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
7d0031a515
Fix Google Translate breaking web interface ( #15610 )
...
- marks the page as a whole as untranslatable
- still marks user text as translatable
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
8046989788
Bump react-select from 3.1.1 to 3.2.0 ( #15571 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.1.1...react-select@3.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
a47f001c12
Bump eslint from 7.17.0 to 7.18.0 ( #15569 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.17.0 to 7.18.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
0180682e21
Bump webpack from 4.45.0 to 4.46.0 ( #15580 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.45.0 to 4.46.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.45.0...v4.46.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
71a019d632
Bump concurrent-ruby from 1.1.7 to 1.1.8 ( #15601 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.7 to 1.1.8.
- [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.7...v1.1.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
a0e1c9a35b
Bump sass from 1.32.2 to 1.32.5 ( #15603 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.2 to 1.32.5.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.32.2...1.32.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
e955ca5463
Fix sign-up restrictions based on IP addresses not being enforced ( #15607 )
...
Fixes #15606
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
d8d75cd6c2
Bump sanitize from 5.2.2 to 5.2.3 ( #15582 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.2...v5.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
77368d8ff9
Bump strong_migrations from 0.7.4 to 0.7.6 ( #15581 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.4 to 0.7.6.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.4...v0.7.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
041a6f9242
Bump webpack-assets-manifest from 4.0.0 to 4.0.1 ( #15579 )
...
Bumps [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/webdeveric/webpack-assets-manifest/releases )
- [Commits](https://github.com/webdeveric/webpack-assets-manifest/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c0499c1fcb
Bump oj from 3.10.18 to 3.11.0 ( #15583 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.18 to 3.11.0.
- [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.10.18...v3.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
266a95ee8f
Bump ox from 2.14.0 to 2.14.1 ( #15576 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.0 to 2.14.1.
- [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.0...v2.14.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
d1d2a4e869
Bump webpack-dev-server from 3.11.1 to 3.11.2 ( #15577 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.2/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
f7c205d8c1
Bump @testing-library/jest-dom from 5.11.8 to 5.11.9 ( #15574 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.8 to 5.11.9.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.8...v5.11.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
3126b9e974
Bump mini-css-extract-plugin from 1.3.3 to 1.3.4 ( #15572 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.3...v1.3.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8c6a3c18ff
Bump webmock from 3.11.0 to 3.11.1 ( #15570 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
b696a902fd
Bump sass-loader from 10.1.0 to 10.1.1 ( #15568 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 10.1.0 to 10.1.1.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.1.0...v10.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
2ff01f78f7
Fix /activity endpoint not require signature in authorized fetch mode ( #15592 )
...
Fixes #15589
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
73d5b05019
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
e202314a75
Merge branch 'master' into glitch-soc/merge-upstream
3 years ago
e46b50e805
Bump capistrano from 3.14.1 to 3.15.0 ( #15537 )
...
* Bump capistrano from 3.14.1 to 3.15.0
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.14.1 to 3.15.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.1...v3.15.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix config/deploy.rb
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
3 years ago
096347be10
Bump webpack from 4.44.2 to 4.45.0 ( #15535 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.2 to 4.45.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.2...v4.45.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
086d1e675a
Bump @rails/ujs from 6.1.0 to 6.1.1 ( #15531 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.0...v6.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
03c8590b28
Bump @testing-library/react from 11.2.2 to 11.2.3 ( #15533 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.2.2 to 11.2.3.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.2.2...v11.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
2d4a550d10
Bump sass from 1.32.0 to 1.32.2 ( #15534 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.0 to 1.32.2.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.32.0...1.32.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
1118194f29
Bump simplecov from 0.21.0 to 0.21.2 ( #15536 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.21.0 to 0.21.2.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.0...v0.21.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
4812c16cb5
Bump sanitize from 5.2.1 to 5.2.2 ( #15538 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
fe6ee39168
Bump nokogiri from 1.11.0 to 1.11.1 ( #15539 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.0...v1.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
54d4e5252b
Use Rails' index_by where it makes sense ( #15542 )
...
* Use Rails' index_by where it makes sense
* Fix tests
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
7bed25f3ea
Fix processing of incoming Block activities ( #15546 )
...
Unlike locally-issued blocks, they weren't clearing follow
relationships in both directions, follow requests or notifications.
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
a7a47834e5
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
31e68bf3d3
[Glitch] Fix OCR lang data failing to load
...
Port 73ddb60c32
3 years ago
33d30632fb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Upstream refactored a bit, glitch-soc had specific code for local-only
statuses.
Updated glitch-soc's specific code accordingly.
3 years ago
11d603101a
Fix muting users with duration via the REST api ( #15516 )
3 years ago
087ed84367
Optimize map { ... }.compact calls ( #15513 )
...
* Optimize map { ... }.compact
using Enumerable#filter_map, supported since Ruby 2.7
* Add poyfill for Enumerable#filter_map
3 years ago
9395143126
Fix maintenance script not re-indexing some indexes on textual values ( #15515 )
...
* Fix maintenance script not re-indexing some indexes on textual values
Fixes #15475
* Refresh instance view at the end of the maintenance script run
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
73ddb60c32
Fix OCR lang data failing to load ( #15519 )
...
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
a1a8aa4a08
Skip processing Update activities on unknown accounts ( #15514 )
...
This also skips fetching the actor completely.
This will be useful if we end up distributing Update activities linked to
account suspensions more widely (they are currently only delivered to
the suspended account's followers), as currently, instances not knowing
about the suspended account would fetch it to then process the suspension.
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
1817f96578
Fix the Dockerfile in case of Kaniko build ( #15510 )
...
Kaniko does not support looking up binaries from $PATH, so we
specify the full path to the bash binary.
Co-authored-by: kaiyou <dev@kaiyou.fr>
3 years ago
Claire