Commit graph

11527 commits

Author SHA1 Message Date
Bèr Kessels
19ffe5f196 Fix typo in login feature-test. (#12651) 2019-12-18 16:54:29 +01:00
Takeshi Umeda
df28debc53 Fix an error when ActivityPub::FetchRemoteStatusService url is called with nil (#12652) 2019-12-18 16:54:03 +01:00
dependabot-preview[bot]
c9bb21aed0 Bump rails from 5.2.3 to 5.2.4 (#12584)
* Bump rails from 5.2.3 to 5.2.4

Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* sprockets ~> 3.7
2019-12-18 08:58:53 +09:00
dependabot-preview[bot]
89ae3ea278 Bump json-ld-preloaded from 3.0.4 to 3.0.6 (#12361)
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 04:04:30 +09:00
dependabot-preview[bot]
99eff32701 Bump react-redux from 7.1.1 to 7.1.3 (#12626)
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.1 to 7.1.3.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.1...v7.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:54:42 +09:00
dependabot-preview[bot]
74c907d29c Bump webpacker from 4.2.0 to 4.2.2 (#12632)
Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:53:15 +09:00
dependabot-preview[bot]
2eb2a27323 Bump eslint-plugin-import from 2.19.0 to 2.19.1 (#12622)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.19.0...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:42:25 +09:00
dependabot-preview[bot]
449b4dbc27 Bump copy-webpack-plugin from 5.0.5 to 5.1.1 (#12621)
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 5.0.5 to 5.1.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v5.0.5...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:42:02 +09:00
dependabot-preview[bot]
45155ede8c Bump css-loader from 3.2.0 to 3.3.2 (#12624)
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.3.2.
- [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.2.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:41:49 +09:00
dependabot-preview[bot]
659d5f4b0c Bump array-includes from 3.0.3 to 3.1.0 (#12627)
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/es-shims/array-includes/releases)
- [Changelog](https://github.com/es-shims/array-includes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/array-includes/compare/v3.0.3...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:40:34 +09:00
dependabot-preview[bot]
b547e5a3c8 Bump doorkeeper from 5.2.2 to 5.2.3 (#12630)
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:36:49 +09:00
dependabot-preview[bot]
24c87fb84b Bump stackprof from 0.2.13 to 0.2.14 (#12631)
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.13 to 0.2.14.
- [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.13...v0.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:34:20 +09:00
dependabot-preview[bot]
c28e0efae4 Bump parallel_tests from 2.29.2 to 2.30.0 (#12634)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:32:51 +09:00
Thibaut Girka
42c357d6bb Fix various issues caused by wrong unread key being updated 2019-12-17 15:55:10 +01:00
ThibG
0b0f358815 Changes to tootctl statuses remove (#11267)
* Fix comments in statuses_cli

The comment for the part of query keeping statuses which have replies was
incorrect, explaining the part of the query kept favourited statuses instead

* Keep statuses favourited by local users in tootctl statuses remove

* Do delete old replies that are not direct interactions with local users

* Skip reblogs of local statuses instead of all reblogs

* Optimize some queries

* Keep old statuses with recent reblogs

* Add option to clear toots from followed accounts too
2019-12-17 13:33:36 +01:00
ThibG
357bee5ab9 Clean up OStatus-related codepaths (#12173)
* Remove “protocol” argument and return value, as only ActivityPub is supported

* Remove FetchRemoteAccountService, only use ActivityPub::FetchRemoteAccountService

* Fix tests
2019-12-17 13:32:57 +01:00
ThibG
f5ac6f7801 Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)
* Revert "Fix ignoring whole status because of one invalid hashtag (#11621)"

This reverts commit 123ffd0a45.

* Fix statuses being rejected because of invalid hashtag names

* Add spec for invalid hashtag names in statuses

* Add test for featured tags controller
2019-12-17 13:31:56 +01:00
scd31
27f1d5ee7d Increase max backup size (#12602)
* Increased max backup size

* partially reverted schema.rb
2019-12-17 13:30:58 +01:00
dependabot-preview[bot]
10ebc46db6 Bump @babel/preset-env from 7.7.4 to 7.7.6 (#12623)
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:20:49 +09:00
dependabot-preview[bot]
0bca0ddfde Bump compression-webpack-plugin from 3.0.0 to 3.0.1 (#12620)
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/v3.0.1/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:19:58 +09:00
dependabot-preview[bot]
cf953596de Bump faker from 2.8.0 to 2.8.1 (#12633)
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.0 to 2.8.1.
- [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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:19:20 +09:00
Alice Gaudon
a285b3c63c Admin setting to disable default follows (#12566) 2019-12-16 23:55:50 +01:00
Thomas Citharel
fce806216b Add Event activity-type support (#12637)
This adds support for Event AP type in Mastodon. Events are converted
into toots by taking their title (AS name) and their URL (AP ID). Event
picture is also brought in if available.

Testable by fetching event content from https://test.mobilizon.org

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-16 23:55:28 +01:00
Sasha Sorokin
65b17826c9 Improve report page structure (#12615)
* Move resolved button to the heading

This is one of the commits on improving overall reports page structure.
It changes where resolved button is located, moving it to the heading,
right next to the "Report #n" header, so-called "hot-place" to look at.

To accomplish this we have to declare one more content variable, change
admin dashboard template to respect it and CSS files for minor styling,
so buttons are inlined and centrally aligned according to the heading.

* Move actions buttons below the report table

I believe that actions to react on report should not be located at the
top of the page, instead they should be either after the table or
reporter's comment. This is just a logical sign that you should not
react to the report without reading all the details first.
2019-12-16 23:55:16 +01:00
Acid Chicken (硫酸鶏)
01c420f44b Fix tooltip messages of multiple poll switcher are reversed (#12616) 2019-12-16 23:55:02 +01:00
dependabot-preview[bot]
bd7736b08b [Security] Bump excon from 0.62.0 to 0.71.0 (#12638)
Bumps [excon](https://github.com/excon/excon) from 0.62.0 to 0.71.0. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-16 23:53:38 +01:00
Bèr Kessels
58dc85e466 Ignore development specfic env file (#12606) 2019-12-13 08:04:57 -05:00
Sasha Sorokin
1cc1840170 Avoid using pluralize on moderation pages (#12589)
Pluralize function from Rails framework does not work with other
languages than English, moreover it does not even work properly with
English [1]. Not that the latest applies to this context, it's just
a sign that we best to avoid this function, especially when there are
more reliable ways.

This commit changes how reports pages generated in order to avoid usage
of pluralize function, replacing it with default translation function,
called with given counter. On top of that, we have to make strings
pluralizable, so have to change locale files.

[1]: https://medium.com/@anna7/b3927de2ca8e#6a60
2019-12-12 19:50:23 +01:00
trwnh
5b127ea614 Fix typo in tootctl statuses remove (#12603) 2019-12-12 19:50:08 +01:00
dependabot-preview[bot]
dc173af0b9 Bump nokogiri from 1.10.5 to 1.10.7 (#12586)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.7.
- [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.5...v1.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-13 02:57:44 +09:00
dependabot-preview[bot]
d5a5056eba Bump rubocop from 0.76.0 to 0.77.0 (#12585)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.76.0...v0.77.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-13 02:57:32 +09:00
Thibaut Girka
35f15cfd1b Fix edit filter link in filtered “Show why” dialog 2019-12-12 16:32:47 +01:00
ThibG
f8e6d5ed5c Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-12-12 16:10:58 +01:00
Thibaut Girka
e859334b33 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
dependabot-preview[bot]
1e0801b45d Bump aws-sdk-s3 from 1.57.0 to 1.59.0 (#12581)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.57.0 to 1.59.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.57.0...v1.59.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:39:11 +09:00
dependabot-preview[bot]
5fef3299cc Bump yargs from 13.3.0 to 15.0.2 (#12574)
Bumps [yargs](https://github.com/yargs/yargs) from 13.3.0 to 15.0.2.
- [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/v13.3.0...v15.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:37:37 +09:00
dependabot-preview[bot]
f1bea30fa6 Bump es6-symbol from 3.1.2 to 3.1.3 (#12577)
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.2...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:37:08 +09:00
dependabot-preview[bot]
ece7462ea8 Bump eslint-plugin-import from 2.18.2 to 2.19.0 (#12580)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:36:28 +09:00
dependabot-preview[bot]
1109972875 Bump @babel/core from 7.7.4 to 7.7.5 (#12578)
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:32:52 +09:00
dependabot-preview[bot]
5c78a30ab7 Bump @babel/runtime from 7.7.4 to 7.7.6 (#12579)
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.6/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:32:26 +09:00
dependabot-preview[bot]
234cdc0f05 Bump @babel/plugin-transform-runtime from 7.7.4 to 7.7.6 (#12575)
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:31:53 +09:00
dependabot-preview[bot]
b86cc1d6d9 Bump react from 16.10.2 to 16.12.0 (#12573)
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.10.2 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)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:31:03 +09:00
dependabot-preview[bot]
fe0229ceb7 Bump terser-webpack-plugin from 2.2.1 to 2.2.2 (#12576)
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.2.1 to 2.2.2.
- [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.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 01:03:00 +01:00
dependabot-preview[bot]
f673e3d120 Bump strong_migrations from 0.4.2 to 0.5.0 (#12583)
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.2 to 0.5.0.
- [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.4.2...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 00:55:03 +01:00
dependabot-preview[bot]
0863d54a8c Bump sidekiq-unique-jobs from 6.0.15 to 6.0.18 (#12582)
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.15 to 6.0.18.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.15...v6.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 00:52:43 +01:00
Eugen Rochko
37795253fc Revert "Fix an eslint warning (#12426)" (#12596)
This reverts commit b93456fd64.
2019-12-10 19:39:02 +01:00
Eugen Rochko
b3f365f605 Add S3_OVERRIDE_PATH_STYLE environment variable (#12594)
To support Exoscale
2019-12-10 07:40:01 +01:00
Eugen Rochko
af95252d4c Fix missing error templates for non-HTML requests (#12593) 2019-12-10 07:39:54 +01:00
Sasha Sorokin
2b592001b2 Use codeblock for native redirect URI (#12570)
This commit changes how doorkeeper.applications.help.native_redirect_uri
string is being formatted to use <code> tag for native_redirect_uri
placeholder. This makes the URI look more distinguishable.
2019-12-09 04:30:58 +01:00
Eugen Rochko
fa15a5e9f2 Fix error handling in tootctl media remove-orphans (#12571) 2019-12-09 04:26:00 +01:00