mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 16:15:01 +01:00
Code Issues Projects Releases Wiki Activity
14,295 Commits 131 Branches 269 Tags 940 MiB
dbbb077c19
Commit Graph

14295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG
e955ca5463
Fix sign-up restrictions based on IP addresses not being enforced (#15607) 
Fixes #15606

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-21 06:18:30 +01:00
dependabot[bot]
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>
 2021-01-20 21:42:34 +09:00
dependabot[bot]
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>
 2021-01-20 21:40:39 +09:00
dependabot[bot]
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>
 2021-01-20 21:32:06 +09:00
dependabot[bot]
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>
 2021-01-20 21:30:56 +09:00
dependabot[bot]
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>
 2021-01-20 21:29:29 +09:00
dependabot[bot]
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>
 2021-01-20 21:28:45 +09:00
dependabot[bot]
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>
 2021-01-20 21:27:49 +09:00
dependabot[bot]
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>
 2021-01-20 21:24:38 +09:00
dependabot[bot]
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>
 2021-01-20 21:17:59 +09:00
dependabot[bot]
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>
 2021-01-20 21:05:06 +09:00
ThibG
2ff01f78f7
Fix /activity endpoint not require signature in authorized fetch mode (#15592) 
Fixes #15589

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-19 06:47:36 +01:00
ThibG
73d5b05019
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2021-01-18 14:37:57 +01:00
Claire
e202314a75 Merge branch 'master' into glitch-soc/merge-upstream 2021-01-18 13:57:12 +01:00
dependabot[bot]
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>
 2021-01-18 11:10:23 +09:00
dependabot[bot]
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>
 2021-01-17 01:12:22 +09:00
dependabot[bot]
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>
 2021-01-17 01:09:26 +09:00
dependabot[bot]
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>
 2021-01-17 01:08:45 +09:00
dependabot[bot]
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>
 2021-01-17 01:08:19 +09:00
dependabot[bot]
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>
 2021-01-17 01:06:28 +09:00
dependabot[bot]
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>
 2021-01-17 01:02:51 +09:00
dependabot[bot]
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>
 2021-01-17 00:59:43 +09:00
ThibG
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>
 2021-01-12 09:27:38 +01:00
ThibG
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>
 2021-01-12 09:25:01 +01:00
ThibG
a7a47834e5
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2021-01-11 13:44:57 +01:00
ThibG
31e68bf3d3 [Glitch] Fix OCR lang data failing to load 
Port 73ddb60c32 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-11 12:00:26 +01:00
Claire
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.
 2021-01-11 11:55:42 +01:00
Levi Bard
11d603101a
Fix muting users with duration via the REST api (#15516) 2021-01-10 12:47:21 +01:00
luigi
087ed84367
Optimize map { ... }.compact calls (#15513) 
* Optimize map { ... }.compact

using Enumerable#filter_map, supported since Ruby 2.7

* Add poyfill for Enumerable#filter_map
 2021-01-10 00:32:01 +01:00
ThibG
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>
 2021-01-09 03:51:32 +01:00
ThibG
73ddb60c32
Fix OCR lang data failing to load (#15519) 
Fixes #15472

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-09 03:48:50 +01:00
ThibG
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>
 2021-01-08 12:26:29 +01:00
kaiyou
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>
 2021-01-08 07:13:26 +01:00
kaiyou
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>
 2021-01-08 07:07:08 +01:00
abcang
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
 2021-01-07 09:40:55 +01:00
Asier Iturralde Sarasola
066dbe1e69
Fix typo: you -> your (#15476) 2021-01-07 09:32:16 +01:00
abcang
7cb72956a6
Set RAILS_ENV in Procfile.dev (#15502) 
* Set RAILS_ENV in Procfile.dev

* Also set on sidekiq
 2021-01-07 09:30:12 +01:00
dependabot[bot]
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>
 2021-01-07 14:10:49 +09:00
dependabot[bot]
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>
 2021-01-07 14:06:15 +09:00
ThibG
d42e7e01dc
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2021-01-06 22:03:23 +01:00
Takeshi Umeda
55e84f9125 [Glitch] Fix logo button style more 
Port 3f4b0dfd47 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-06 19:03:52 +01:00
Takeshi Umeda
7710a6c4b1 [Glitch] Fix logo button style 
Port ba748a83f2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-06 19:03:21 +01:00
Takeshi Umeda
f3aa085af5 [Glitch] Fix getting-started footer in single column mode not being clickable in Safari 
Port e38874dcf7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-06 18:38:10 +01:00
Takeshi Umeda
98fd0cca55 [Glitch] Fix defaultProps of frameRate to string 
Port a50fe47a77 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-06 18:32:37 +01:00
Takeshi Umeda
f17ff99257 [Glitch] Fix missing key in list timeline policy 
Port 71f0968887 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-01-06 18:23:44 +01:00
Claire
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.
 2021-01-06 18:08:06 +01:00
abcang
69763b6385
update codeclimate-rubocop (#15500) 2021-01-06 07:49:48 +01:00
Cecylia Bocovich
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.
 2021-01-05 22:25:07 +01:00
dependabot[bot]
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>
 2021-01-05 20:01:31 +01:00
Takeshi Umeda
a50fe47a77
Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00