ThibG
2ee5a9d9c3
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
ThibG
da2143b308
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 dff46b260b
.
* 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
scd31
3830c0b741
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]
0aaedcd66f
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]
7e736d77dd
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
dependabot-preview[bot]
ed015e2e3d
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
Alice Gaudon
668f698077
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
Thomas Citharel
8094955461
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
Sasha Sorokin
34aa5c7cb2
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
Acid Chicken (硫酸鶏)
09a72add0e
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
dependabot-preview[bot]
f4906f2cac
[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
Bèr Kessels
d53330f65b
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
Sasha Sorokin
d5b7a4b116
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
trwnh
1c10283217
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]
fb17814d4a
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
dependabot-preview[bot]
bc6141b085
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
Thibaut Girka
6a1b4c3452
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
ThibG
c1befd3909
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
Thibaut Girka
be4849c083
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]
d08a497946
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]
c7a9e14c46
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]
5ff2d8c247
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]
c2fa1b9ca9
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]
c89a686ea4
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]
cc87e9ec70
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