73d5b05019
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
e202314a75
Merge branch 'master' into glitch-soc/merge-upstream
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 years ago
a7a47834e5
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
31e68bf3d3
[Glitch] Fix OCR lang data failing to load
...
Port 73ddb60c32
4 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.
4 years ago
11d603101a
Fix muting users with duration via the REST api ( #15516 )
4 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
4 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>
4 years ago
73ddb60c32
Fix OCR lang data failing to load ( #15519 )
...
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 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>
4 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>
4 years ago
f47c177eb7
Support clock drift in Omniauth SAML provider ( #15511 )
...
The setting is not well documented by the provider, but allows for
clock skew between SP and IDP, see:
https://github.com/omniauth/omniauth-saml/blob/master/spec/omniauth/strategies/saml_spec.rb
Co-authored-by: kaiyou <dev@kaiyou.fr>
4 years ago
efffdd3778
Fix rubocop config and warnings ( #15503 )
...
* disable NewCops
* update TargetRubyVersion
* Fix Lint/MissingSuper for ActiveModelSerializers::Model
* Fix Lint/MissingSuper for feed
* Fix Lint/FloatComparison
* Do not use instance variables
4 years ago
066dbe1e69
Fix typo: you -> your ( #15476 )
4 years ago
7cb72956a6
Set RAILS_ENV in Procfile.dev ( #15502 )
...
* Set RAILS_ENV in Procfile.dev
* Also set on sidekiq
4 years ago
32df8950ae
Bump binding_of_caller from 0.8.0 to 1.0.0 ( #15489 )
...
Bumps [binding_of_caller](https://github.com/banister/binding_of_caller ) from 0.8.0 to 1.0.0.
- [Release notes](https://github.com/banister/binding_of_caller/releases )
- [Commits](https://github.com/banister/binding_of_caller/compare/v0.8.0...v1.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
58e452beb8
Bump webpack-assets-manifest from 3.1.1 to 4.0.0 ( #15288 )
...
Bumps [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest ) from 3.1.1 to 4.0.0.
- [Release notes](https://github.com/webdeveric/webpack-assets-manifest/releases )
- [Commits](https://github.com/webdeveric/webpack-assets-manifest/compare/v3.1.1...v4.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d42e7e01dc
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
55e84f9125
[Glitch] Fix logo button style more
...
Port 3f4b0dfd47
4 years ago
7710a6c4b1
[Glitch] Fix logo button style
...
Port ba748a83f2
4 years ago
f3aa085af5
[Glitch] Fix getting-started footer in single column mode not being clickable in Safari
...
Port e38874dcf7
4 years ago
98fd0cca55
[Glitch] Fix defaultProps of frameRate to string
...
Port a50fe47a77
4 years ago
f17ff99257
[Glitch] Fix missing key in list timeline policy
...
Port 71f0968887
4 years ago
90528f43bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/configuration.js`:
Upstream updated the `js-yaml` dependency, which changed how to call it.
Those changes conflicted because that code is pretty different in glitch-soc
which has to deal with its more complex theming system.
Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
Not really a conflict, just glitch-soc-specific dependencies textually too
close to some dependencies updated upstream.
4 years ago
69763b6385
update codeclimate-rubocop ( #15500 )
4 years ago
38bc4b9562
Set X-Forwarded-Proto to request scheme ( #15310 ) ( #15498 )
...
This fixes a bug that prevents logins to mastodon onion services. The
nginx directive assumed all requests were made over https, causing a
domain mismatch for onion services that have https redirects disabled.
The fix more correctly sets X-Forwarded-Proto to the actual scheme used
in the request.
4 years ago
15be57059d
Bump nokogiri from 1.10.10 to 1.11.0 ( #15487 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.0.
- [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.10.10...v1.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a50fe47a77
Fix defaultProps of frameRate to string ( #15493 )
4 years ago
71f0968887
Fix missing key in list timeline policy ( #15494 )
4 years ago
e38874dcf7
Fix getting-started footer in single column mode not being clickable in Safari ( #15496 )
4 years ago
c747883dc8
Bump ruby-progressbar from 1.10.1 to 1.11.0 ( #15491 )
...
Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar ) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/jfelchner/ruby-progressbar/releases )
- [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.10.1...releases/v1.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
77611aad83
Bump simplecov from 0.20.0 to 0.21.0 ( #15485 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.20.0 to 0.21.0.
- [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.20.0...v0.21.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
e1fe8b8b69
Bump fuubar from 2.5.0 to 2.5.1 ( #15488 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.5.0...releases/2.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
592f999d4f
Bump tzinfo-data from 1.2020.5 to 1.2020.6 ( #15479 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.5 to 1.2020.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.5...v1.2020.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
40dd048ace
Bump js-yaml from 3.14.1 to 4.0.0 ( #15484 )
...
* Bump js-yaml from 3.14.1 to 4.0.0
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 3.14.1 to 4.0.0.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/3.14.1...4.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Replace deprecated method
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years ago
fcf57c2440
Bump @testing-library/jest-dom from 5.11.6 to 5.11.8 ( #15480 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.6 to 5.11.8.
- [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.6...v5.11.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
3a1ca30252
Bump eslint from 7.16.0 to 7.17.0 ( #15483 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.16.0 to 7.17.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.16.0...v7.17.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1817fce074
Bump webpack-dev-server from 3.11.0 to 3.11.1 ( #15481 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/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>
4 years ago
cbb48501c3
Bump eslint-plugin-react from 7.21.5 to 7.22.0 ( #15482 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.21.5 to 7.22.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.21.5...v7.22.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9873f7ec27
Bump sass from 1.30.0 to 1.32.0 ( #15486 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.30.0 to 1.32.0.
- [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.30.0...1.32.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
ThibG