98b2ae764a
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
1a9e0432ae
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
f0e14aa852
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
b299637082
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
a8da188d06
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
9c9a3fff94
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
0238151f8a
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
4fa68913d3
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
3b60a98e9b
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
297cfaa3bb
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
2582047c36
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
42a9b50d36
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
b496be77d5
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
81bc91bc10
[Glitch] Fix OCR lang data failing to load
...
Port f1cf85d5a0
4 years ago
77a975a964
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
87d45a9cd8
Fix muting users with duration via the REST api ( #15516 )
4 years ago
944b059f50
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
745e925324
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
f1cf85d5a0
Fix OCR lang data failing to load ( #15519 )
...
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
8a54766750
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
a765a70d6b
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
0d96b710cb
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
41f9aa5dbb
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
d94cae9bd2
Fix typo: you -> your ( #15476 )
4 years ago
e8aa0a07c2
Set RAILS_ENV in Procfile.dev ( #15502 )
...
* Set RAILS_ENV in Procfile.dev
* Also set on sidekiq
4 years ago
c31a08a6a3
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
1ef6c86ed9
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
f94a59ffd7
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
86238966fa
[Glitch] Fix logo button style more
...
Port 74f34c1291
4 years ago
98b22023b9
[Glitch] Fix logo button style
...
Port 0ffece77ab
4 years ago
c7a08708bf
[Glitch] Fix getting-started footer in single column mode not being clickable in Safari
...
Port ccb7aa93c7
4 years ago
251ce8e88a
[Glitch] Fix defaultProps of frameRate to string
...
Port 8c0b9e37d0
4 years ago
f44514858d
[Glitch] Fix missing key in list timeline policy
...
Port 7e9a91ae63
4 years ago
1ddb91d539
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
c050dd8b17
update codeclimate-rubocop ( #15500 )
4 years ago
62b7b4b1d6
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
3b33a91ce1
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
8c0b9e37d0
Fix defaultProps of frameRate to string ( #15493 )
4 years ago
7e9a91ae63
Fix missing key in list timeline policy ( #15494 )
4 years ago
ccb7aa93c7
Fix getting-started footer in single column mode not being clickable in Safari ( #15496 )
4 years ago
3c3a2b74a8
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
ce9583f4a1
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
c12782794f
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
f4a1ff5911
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
3d97456deb
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
bceb2eff29
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
9856071049
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
0c90cbd5d5
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
7a20ea7ed8
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
1bf29dea0e
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
Claire
dependabot[bot]
Levi Bard
luigi
kaiyou
abcang
Asier Iturralde Sarasola
Takeshi Umeda
Cecylia Bocovich