531afaef0f
Bump webpack-dev-server from 3.9.0 to 3.10.1 ( #12773 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.9.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 22:30:00 +09:00
7a7ef7fb0a
Bump enzyme-adapter-react-16 from 1.15.1 to 1.15.2 ( #12777 )
...
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/airbnb/enzyme/releases )
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.2/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 19:42:03 +09:00
862ba3afad
Bump yargs from 15.0.2 to 15.1.0 ( #12771 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.0.2 to 15.1.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.0.2...v15.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 19:41:02 +09:00
e6fc490011
Bump css-loader from 3.4.0 to 3.4.1 ( #12772 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 19:39:37 +09:00
bcfd6e3bb4
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-01-05 13:51:50 +01:00
bd42608be2
Update lockfile for #12758 ( #12762 )
2020-01-05 02:25:07 +01:00
83359fef2b
[Glitch] Fix shortNumberFormat to within 3 chars without units
...
Port 0e8c0287d0
2020-01-04 23:04:52 +01:00
01eaeab56d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
2020-01-04 23:04:42 +01:00
2ecc7802ca
Gemfile Updates - Others ( #12761 )
...
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
2020-01-04 22:48:57 +01:00
3537bb1b52
Gemfile Updates - Ruby 2.7 prep ( #12758 )
...
* Update Gemfile
* Update Gemfile
2020-01-04 22:48:34 +01:00
882a7d3d14
Gemfile Updates - fixes warnings ( #12759 )
...
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
2020-01-04 22:48:18 +01:00
49b2f7c0a2
Fix base64-encoded file uploads not being possible ( #12748 )
...
Fix #3804 , Fix #5776
2020-01-04 01:54:07 +01:00
500276c99b
fix unresolved external in @clusterws/cws by upgrading it ( #12752 )
2020-01-03 19:57:25 +09:00
59c697a30c
Fix resource_owner_from_credentials in Doorkeeper initializer ( #12743 )
...
- Nil error when e-mail not found
- LDAP authentication used in place of PAM authentication
2020-01-03 05:35:46 +01:00
4729341903
Fix missing authentication call in filters controller ( #12746 )
2020-01-03 05:29:08 +01:00
83deae5bd7
Fix uncaught unknown format errors in host meta controller ( #12747 )
2020-01-03 05:28:56 +01:00
e4d75f238b
Fix URL search not returning private toots user has access to ( #12742 )
2020-01-03 05:01:45 +01:00
6a8c8dc6fb
Fix cache digesting log noise on status embeds ( #12750 )
2020-01-03 05:00:17 +01:00
6c1ba513ee
Add feature test that tests behaviour of profile name and bio ( #12658 )
...
* Add feature test that tests behaviour of profile name and bio
* Fix rubocop style errors in Login Spec.
* DRY log_in_spec by reusing the stories helper
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-01-03 02:44:06 +01:00
9cbbc50fcd
Fix 12661 ( #12744 )
...
* Revert "persist last-intersected status update and restore when ScrollableList is restored"
This reverts commit 07e26142ef6a8e74bd2ac5e9b461a5a1699bd4c8.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
* Revert "cache currently-viewing status id to avoid calling redux with identical value"
This reverts commit c93df2159fbd3888a5c48d8a8b8ae61dbbc54b89.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
2020-01-02 22:46:42 +01:00
aa138ea350
Fix RefollowWorker not keeping show_reblogs setting ( #12707 )
...
* Fix RefollowWorker not keeping show_reblogs setting
* Fix RefollowWorker
2020-01-02 20:52:39 +01:00
09d54d1f62
Fix uncaught query param encoding errors ( #12741 )
2020-01-02 17:14:58 +01:00
9edab7afaf
Add translation project promotion link ( #12736 )
...
This commit adds promotional notice on appearance settings about
translation project if any other locale than English is used. It
allows users to learn and contribute translations to Mastodon.
Step ahead, in this commit one unusual string is added - link to a
guide. By default it refers to Crowdin project itself, but if any of
Mastodon localization teams established their own guide, they can
refer it. Or, if Crowdin supports localized domain for language, it
can also be put there (e.g. https://fr.crowdin.com/ ...).
2019-12-31 22:15:05 +01:00
2a5da8c961
refactor IntersectionObserver to observe viewport in single-column mode ( #12735 )
2019-12-31 21:39:25 +01:00
3b3bdc7293
Hide blocked users from more places ( #12733 )
...
* Hide blocked, muted, and blocked-by users from toot favourite lists
* Hide blocked, muted, and blocked-by users from toot reblog lists
* Hide blocked, muted, and blocked-by users from followers/following (API)
* Fix tests
* Hide blocked, muted, and blocked-by users from followers/following on public pages
2019-12-31 00:55:32 +01:00
2999c95596
Fix error when fetching followers/following from REST API when user has network hidden ( #12716 )
...
Fix #12510
2019-12-31 00:54:38 +01:00
f86ee4b59f
Fix IDN mentions not being processed, IDN domains not being rendered ( #12715 )
...
This changes the REST API to return unicode domains in the `acct`
attribute instead of punycode, and to render unicode instead of
punycode on public HTML pages as well.
Fix #7812 , fix #12246
2019-12-30 19:20:43 +01:00
b2f81060b7
Remove unused AccountRelationshipsPresenter call in public pages ( #12734 )
...
Those were used to show a “follow” or “unfollow” button on account grid on
public pages, but that got removed a while ago.
2019-12-30 19:13:02 +01:00
bb27ca14ef
Fix error when searching for empty phrase ( #12711 )
...
Fix #12619
2019-12-30 18:30:24 +01:00
108e390d23
Bump webpack from 4.41.2 to 4.41.5 ( #12724 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.2 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.2...v4.41.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 01:49:08 +09:00
5c8a8bf798
Bump stackprof from 0.2.14 to 0.2.15 ( #12726 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:23:05 +09:00
d5f93ea618
Bump pg from 1.1.4 to 1.2.0 ( #12725 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:21:51 +09:00
a439fc7f72
Bump redis-namespace from 1.6.0 to 1.7.0 ( #12727 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:16:45 +09:00
333009d8b1
Bump faker from 2.9.0 to 2.10.0 ( #12728 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:15:16 +09:00
a2fe2e98ee
Bump react-test-renderer from 16.11.0 to 16.12.0 ( #12721 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:14:42 +09:00
9fe5ba82c5
Bump derailed_benchmarks from 1.4.2 to 1.4.3 ( #12729 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.2...v1.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:13:25 +09:00
6245075158
Bump is-nan from 1.2.1 to 1.3.0 ( #12723 )
...
Bumps [is-nan](https://github.com/es-shims/is-nan ) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/es-shims/is-nan/releases )
- [Changelog](https://github.com/es-shims/is-nan/blob/master/CHANGELOG.md )
- [Commits](https://github.com/es-shims/is-nan/compare/v1.2.1...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:07:27 +09:00
a80fb33be4
Bump rack-cors from 1.1.0 to 1.1.1 ( #12730 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.1.0...v1.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 23:58:24 +09:00
3902b7677a
Bump terser-webpack-plugin from 2.2.2 to 2.3.1 ( #12722 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.2.2 to 2.3.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.2.2...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 23:56:23 +09:00
ed34c0401a
Bump @babel/core from 7.7.5 to 7.7.7 ( #12720 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.7.5 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.5...v7.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 23:55:03 +09:00
0242f8ae8b
Bump redux from 4.0.4 to 4.0.5 ( #12719 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/reduxjs/redux/releases )
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/redux/compare/v4.0.4...v4.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 23:54:43 +09:00
54e6c1c47e
Bump eslint from 6.7.2 to 6.8.0 ( #12717 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.7.2 to 6.8.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/v6.7.2...v6.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 21:54:04 +09:00
e7d3495874
Upgrade Node v12 in Dockerfile ( #12703 )
2019-12-30 07:41:40 +01:00
6e9e8d89fa
Fix settings pages being cacheable by the browser ( #12714 )
...
Fix #12255
2019-12-30 04:38:30 +01:00
353c94910b
Fix HTML error pages being returned when JSON is expected ( #12713 )
...
Fix #12509
See also #12214
2019-12-30 04:38:18 +01:00
ca78b1473e
Fix undefined error regression in status component in web UI ( #12712 )
...
Regression from #12661
2019-12-30 03:55:11 +01:00
7e074610a6
Fix backups stopping due to read timeouts ( #12281 )
...
* Make BackupService resilient to read timeouts
If an attachment read times out, assume that the resources is
inaccessible and continue the backup without it. This fixes #12280 .
* Both errors on one line
2019-12-30 03:17:54 +01:00
7a81346d55
Circleci - Upgrade to Buster Images ( #12705 )
...
* Update config.yml
* Update Gemfile.lock
2019-12-29 17:00:43 +01:00
0e8c0287d0
Fix shortNumberFormat to within 3 chars without units ( #12706 )
2019-12-29 16:59:25 +01:00
162dc845a0
Fix batch actions on non-pending tags in admin interface ( #12537 )
...
- Allow batch actions on unreviewed tags
- Hide checkboxes when batch actions aren't available
2019-12-29 05:41:26 +01:00
dependabot-preview[bot]
ThibG
mayaeh
Takeshi Umeda
Shlee
Eugen Rochko
Bastien Durel
Bèr Kessels
Matt Panaro
Sasha Sorokin
chr v1.x