]>
cat aescling's git repositories - mastodon.git/log
ThibG [Tue, 26 Jan 2021 22:21:32 +0000 (23:21 +0100)]
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
leo60228 [Sat, 23 Jan 2021 18:15:27 +0000 (13:15 -0500)]
Support customizing poll option limits
ThibG [Fri, 22 Jan 2021 09:09:23 +0000 (10:09 +0100)]
[Glitch] Add “translate” class to other user strings
Port
5fcac81302ad323a86ab43243c242c4a10cd338a to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Claire [Tue, 26 Jan 2021 13:01:30 +0000 (14:01 +0100)]
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.
Takeshi Umeda [Mon, 25 Jan 2021 08:22:41 +0000 (17:22 +0900)]
Fix first return value of FetchLinkCardService.html method (#15630)
Joe [Sun, 24 Jan 2021 08:14:35 +0000 (03:14 -0500)]
Fix link to documentation repo (#15620)
dependabot[bot] [Sat, 23 Jan 2021 14:25:08 +0000 (23:25 +0900)]
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>
luigi [Fri, 22 Jan 2021 15:28:15 +0000 (10:28 -0500)]
Use Enumerable#filter_map in more places (#15527)
Daigo 3 Dango [Fri, 22 Jan 2021 09:09:40 +0000 (09:09 +0000)]
Use libvpx >= 5 (#15591)
Ubuntu 18.04 provides libvpx5 while Ubuntu 20.04 does libvpx6
ThibG [Fri, 22 Jan 2021 09:09:23 +0000 (10:09 +0100)]
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>
luigi [Fri, 22 Jan 2021 09:09:08 +0000 (04:09 -0500)]
Optimize some regex matching (#15528)
* Use Regex#match?
* Replace =~ too
* Avoid to call match? from Nil
* Keep value of Regexp.last_match
ThibG [Thu, 21 Jan 2021 16:51:43 +0000 (17:51 +0100)]
Merge pull request #1487 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Thu, 21 Jan 2021 13:29:54 +0000 (14:29 +0100)]
[Glitch] Fix Google Translate breaking web interface
Port
7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Claire [Thu, 21 Jan 2021 15:51:12 +0000 (16:51 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream
ThibG [Thu, 21 Jan 2021 13:29:54 +0000 (14:29 +0100)]
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>
dependabot[bot] [Thu, 21 Jan 2021 12:47:55 +0000 (21:47 +0900)]
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>
dependabot[bot] [Thu, 21 Jan 2021 12:47:33 +0000 (21:47 +0900)]
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>
dependabot[bot] [Thu, 21 Jan 2021 12:46:54 +0000 (21:46 +0900)]
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>
dependabot[bot] [Thu, 21 Jan 2021 12:46:37 +0000 (21:46 +0900)]
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>
dependabot[bot] [Thu, 21 Jan 2021 12:46:16 +0000 (21:46 +0900)]
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>
ThibG [Thu, 21 Jan 2021 05:18:30 +0000 (06:18 +0100)]
Fix sign-up restrictions based on IP addresses not being enforced (#15607)
Fixes #15606
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
dependabot[bot] [Wed, 20 Jan 2021 12:42:34 +0000 (21:42 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:40:39 +0000 (21:40 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:32:06 +0000 (21:32 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:30:56 +0000 (21:30 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:29:29 +0000 (21:29 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:28:45 +0000 (21:28 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:27:49 +0000 (21:27 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:24:38 +0000 (21:24 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:17:59 +0000 (21:17 +0900)]
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>
dependabot[bot] [Wed, 20 Jan 2021 12:05:06 +0000 (21:05 +0900)]
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>
ThibG [Tue, 19 Jan 2021 05:47:36 +0000 (06:47 +0100)]
Fix /activity endpoint not require signature in authorized fetch mode (#15592)
Fixes #15589
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
ThibG [Mon, 18 Jan 2021 13:37:57 +0000 (14:37 +0100)]
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Claire [Mon, 18 Jan 2021 12:57:12 +0000 (13:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
dependabot[bot] [Mon, 18 Jan 2021 02:10:23 +0000 (11:10 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:12:22 +0000 (01:12 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:09:26 +0000 (01:09 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:08:45 +0000 (01:08 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:08:19 +0000 (01:08 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:06:28 +0000 (01:06 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 16:02:51 +0000 (01:02 +0900)]
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>
dependabot[bot] [Sat, 16 Jan 2021 15:59:43 +0000 (00:59 +0900)]
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>
ThibG [Tue, 12 Jan 2021 08:27:38 +0000 (09:27 +0100)]
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>
ThibG [Tue, 12 Jan 2021 08:25:01 +0000 (09:25 +0100)]
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>
ThibG [Mon, 11 Jan 2021 12:44:57 +0000 (13:44 +0100)]
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Sat, 9 Jan 2021 02:48:50 +0000 (03:48 +0100)]
[Glitch] Fix OCR lang data failing to load
Port
73ddb60c32090c9685f3b74e0bbb4a06b34a7083 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Claire [Mon, 11 Jan 2021 10:55:42 +0000 (11:55 +0100)]
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.
Levi Bard [Sun, 10 Jan 2021 11:47:21 +0000 (12:47 +0100)]
Fix muting users with duration via the REST api (#15516)
luigi [Sat, 9 Jan 2021 23:32:01 +0000 (18:32 -0500)]
Optimize map { ... }.compact calls (#15513)
* Optimize map { ... }.compact
using Enumerable#filter_map, supported since Ruby 2.7
* Add poyfill for Enumerable#filter_map
ThibG [Sat, 9 Jan 2021 02:51:32 +0000 (03:51 +0100)]
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>
ThibG [Sat, 9 Jan 2021 02:48:50 +0000 (03:48 +0100)]
Fix OCR lang data failing to load (#15519)
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
ThibG [Fri, 8 Jan 2021 11:26:29 +0000 (12:26 +0100)]
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>
kaiyou [Fri, 8 Jan 2021 06:13:26 +0000 (07:13 +0100)]
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>
kaiyou [Fri, 8 Jan 2021 06:07:08 +0000 (07:07 +0100)]
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>
abcang [Thu, 7 Jan 2021 08:40:55 +0000 (17:40 +0900)]
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
Asier Iturralde Sarasola [Thu, 7 Jan 2021 08:32:16 +0000 (09:32 +0100)]
Fix typo: you -> your (#15476)
abcang [Thu, 7 Jan 2021 08:30:12 +0000 (17:30 +0900)]
Set RAILS_ENV in Procfile.dev (#15502)
* Set RAILS_ENV in Procfile.dev
* Also set on sidekiq
dependabot[bot] [Thu, 7 Jan 2021 05:10:49 +0000 (14:10 +0900)]
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>
dependabot[bot] [Thu, 7 Jan 2021 05:06:15 +0000 (14:06 +0900)]
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>
ThibG [Wed, 6 Jan 2021 21:03:23 +0000 (22:03 +0100)]
Merge pull request #1482 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Takeshi Umeda [Wed, 30 Dec 2020 22:18:39 +0000 (07:18 +0900)]
[Glitch] Fix logo button style more
Port
3f4b0dfd47d35818b36fedb767a5a82dc02f87cc to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Takeshi Umeda [Sat, 26 Dec 2020 22:50:34 +0000 (07:50 +0900)]
[Glitch] Fix logo button style
Port
ba748a83f2050dff27758bce67c05d37a8b7d8f3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Takeshi Umeda [Tue, 5 Jan 2021 18:57:32 +0000 (03:57 +0900)]
[Glitch] Fix getting-started footer in single column mode not being clickable in Safari
Port
e38874dcf7b0fca0f9934fcd0e12bba457c7c212 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Takeshi Umeda [Tue, 5 Jan 2021 19:00:42 +0000 (04:00 +0900)]
[Glitch] Fix defaultProps of frameRate to string
Port
a50fe47a77118dba043143c01d0d6ad6c82f9b31 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Takeshi Umeda [Tue, 5 Jan 2021 18:57:50 +0000 (03:57 +0900)]
[Glitch] Fix missing key in list timeline policy
Port
71f09688878241f0a47fd637047afbf0148f0abf to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Claire [Wed, 6 Jan 2021 17:08:06 +0000 (18:08 +0100)]
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.
abcang [Wed, 6 Jan 2021 06:49:48 +0000 (15:49 +0900)]
update codeclimate-rubocop (#15500)
Cecylia Bocovich [Tue, 5 Jan 2021 21:25:07 +0000 (16:25 -0500)]
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.
dependabot[bot] [Tue, 5 Jan 2021 19:01:31 +0000 (20:01 +0100)]
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>
Takeshi Umeda [Tue, 5 Jan 2021 19:00:42 +0000 (04:00 +0900)]
Fix defaultProps of frameRate to string (#15493)
Takeshi Umeda [Tue, 5 Jan 2021 18:57:50 +0000 (03:57 +0900)]
Fix missing key in list timeline policy (#15494)
Takeshi Umeda [Tue, 5 Jan 2021 18:57:32 +0000 (03:57 +0900)]
Fix getting-started footer in single column mode not being clickable in Safari (#15496)
dependabot[bot] [Mon, 4 Jan 2021 17:10:33 +0000 (02:10 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 17:10:10 +0000 (02:10 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 17:09:39 +0000 (02:09 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 17:09:14 +0000 (02:09 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 17:08:59 +0000 (02:08 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 12:04:11 +0000 (21:04 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 12:04:00 +0000 (21:04 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 12:03:32 +0000 (21:03 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 12:02:23 +0000 (21:02 +0900)]
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>
dependabot[bot] [Mon, 4 Jan 2021 12:01:46 +0000 (21:01 +0900)]
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>
Sophie Parker [Wed, 30 Dec 2020 22:19:55 +0000 (09:19 +1100)]
Improve Emoji import (fix #15429) (#15430)
* Improve Emoji import
Skip macOS '._' shadow files in tar archive to speed up import
* Fix codeclimate format issue with whitespace
* Update lib/mastodon/emoji_cli.rb
suggestions from Gargron to improve comment
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
* Update emoji_cli.rb
Remove extraneous comment (macOS-specific comment now with correct line)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
ThibG [Wed, 30 Dec 2020 22:19:18 +0000 (23:19 +0100)]
Fix profile update not being sent on profile/header picture deletion (#15461)
Fixes #15460
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Takeshi Umeda [Wed, 30 Dec 2020 22:18:39 +0000 (07:18 +0900)]
Fix logo button style more (#15458)
Takeshi Umeda [Wed, 30 Dec 2020 22:18:11 +0000 (07:18 +0900)]
Fix expand video on public page (#15469)
dependabot[bot] [Wed, 30 Dec 2020 11:14:00 +0000 (20:14 +0900)]
Bump i18n-tasks from 0.9.31 to 0.9.33 (#15445)
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.31 to 0.9.33.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.33)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 11:05:32 +0000 (20:05 +0900)]
Bump memory_profiler from 0.9.14 to 1.0.0 (#15289)
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.14 to 1.0.0.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.14...v1.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 10:19:41 +0000 (19:19 +0900)]
Bump @rails/ujs from 6.0.3 to 6.1.0 (#15336)
Bumps [@rails/ujs](https://github.com/rails/rails) from 6.0.3 to 6.1.0.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.0.3...v6.1.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 10:19:16 +0000 (19:19 +0900)]
Bump @babel/preset-env from 7.12.7 to 7.12.11 (#15394)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.7 to 7.12.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.11/packages/babel-preset-env)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 04:08:17 +0000 (13:08 +0900)]
Bump @babel/core from 7.12.7 to 7.12.10 (#15340)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.7 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-core)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:39:38 +0000 (12:39 +0900)]
Bump cld3 from 3.3.0 to 3.4.1 (#15391)
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.3.0 to 3.4.1.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.3.0...v3.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:17:56 +0000 (12:17 +0900)]
Bump webmock from 3.10.0 to 3.11.0 (#15388)
Bumps [webmock](https://github.com/bblimke/webmock) from 3.10.0 to 3.11.0.
- [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.10.0...v3.11.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:17:39 +0000 (12:17 +0900)]
Bump strong_migrations from 0.7.2 to 0.7.4 (#15389)
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.2 to 0.7.4.
- [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.2...v0.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:17:11 +0000 (12:17 +0900)]
Bump rubocop-rails from 2.8.1 to 2.9.1 (#15390)
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:13:56 +0000 (12:13 +0900)]
Bump webpack-bundle-analyzer from 4.1.0 to 4.3.0 (#15395)
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.1.0 to 4.3.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.1.0...v4.3.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:13:29 +0000 (12:13 +0900)]
Bump rspec-rails from 4.0.1 to 4.0.2 (#15442)
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 03:08:12 +0000 (12:08 +0900)]
Bump brakeman from 4.10.0 to 4.10.1 (#15444)
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.10.0 to 4.10.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.10.0...v4.10.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 02:55:58 +0000 (11:55 +0900)]
Bump object.values from 1.1.1 to 1.1.2 (#15248)
Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/es-shims/Object.values/releases)
- [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md)
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.1...v1.1.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Wed, 30 Dec 2020 02:52:41 +0000 (11:52 +0900)]
Bump tzinfo-data from 1.2020.4 to 1.2020.5 (#15448)
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.4 to 1.2020.5.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.4...v1.2020.5)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>