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
5 years ago
trwnh
5b127ea614
Fix typo in tootctl statuses remove ( #12603 )
5 years ago
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>
5 years ago
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>
5 years ago
Thibaut Girka
35f15cfd1b
Fix edit filter link in filtered “Show why” dialog
5 years ago
ThibG
f8e6d5ed5c
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
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
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
Eugen Rochko
37795253fc
Revert "Fix an eslint warning ( #12426 )" ( #12596 )
...
This reverts commit b93456fd64
.
5 years ago
Eugen Rochko
b3f365f605
Add `S3_OVERRIDE_PATH_STYLE` environment variable ( #12594 )
...
To support Exoscale
5 years ago
Eugen Rochko
af95252d4c
Fix missing error templates for non-HTML requests ( #12593 )
5 years ago
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.
5 years ago
Eugen Rochko
fa15a5e9f2
Fix error handling in `tootctl media remove-orphans` ( #12571 )
5 years ago
ThibG
396823e8f4
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
Eugen Rochko
0769ef8277
Add `tootctl media remove-orphans` ( #12568 )
5 years ago
Thibaut Girka
a9cece1403
Fix erroneous inclusion of upstream code
5 years ago
Hinaloe
e3cac8df6d
[Glitch] Highlight border when focusing poll-form footer
...
Port 26dedf7857
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Takeshi Umeda
5ccd525287
[Glitch] Add basic support for group actors
...
Port 58dd9698c3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
2674dd5701
[Glitch] Fix poll options not being selectable via keyboard
...
Port c53ba20166
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
8bc0822716
[Glitch] Add follow_request notification type
...
Port 60d26cabf0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Shlee
1fb108c696
[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2
...
Port 80a3e8e0e4
to glitch-soc
Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka
2cc60e8b09
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
5 years ago
Eugen Rochko
2eda06b768
Fix generic HTTP 500 error on duplicate records ( #12563 )
...
Fix #12551
Fix #12547
5 years ago
trwnh
a2f67154a4
Fix account search with no query ( #12549 )
...
* Fix account search with no query
Modeled after #12541 . Fix #12548
* fix codeclimate
5 years ago
dependabot-preview[bot]
af15853752
[Security] Bump puma from 4.2.0 to 4.3.1 ( #12559 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
Hinaloe
26dedf7857
Highlight border when focusing poll-form footer ( #12544 )
5 years ago
Jeong Arm
d37ed5bc2a
Fix media open hotkey ( #12546 )
5 years ago
Takeshi Umeda
dffb8a8340
Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper ( #12545 )
5 years ago
Takeshi Umeda
58dd9698c3
Add basic support for group actors ( #12071 )
...
* Show badge on group actor in WebUI
* Do not notify in case of by following group actor
* If you mention group actor, also mention group actor followers
* Relax characters that can be used in username (same as Application)
* Revert "Relax characters that can be used in username (same as Application)"
This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b.
* Delete display_name method
5 years ago
Shlee
80a3e8e0e4
upgrade/replace websocket.js to @gamestdio/websocket v2 ( #12543 )
...
* Update stream.js
* Update package.json
* Update yarn.lock
Co-authored-by: hina <hina@hinaloe.net>
5 years ago
ThibG
3dd5448883
Fix old migration failing with new status default scope ( #12493 )
5 years ago
Eugen Rochko
5d810aae4f
Fix error when using search API with no query ( #12541 )
...
Fix #12462
5 years ago
trwnh
f0e3b99553
Return `discoverable` via REST API ( fix #12507 ) ( #12508 )
5 years ago
ThibG
c53ba20166
Fix poll options not being selectable via keyboard ( #12538 )
...
* Fix poll options not being selectable via keyboard
Fixes #12384
* Improve styling of poll option checkboxes/radio buttons
* Use more appropriate ARIA roles for poll options
* Allow switching between single and multiple choice from keyboard
* Coding style
* Avoid using .bind()
5 years ago
tateisu
f00f6bdd36
add S3_OPEN_TIMEOUT environment variable ( #12459 )
5 years ago
Yamagishi Kazutoshi
ca7447ca96
Move rspec examples to tmp dir ( #12539 )
5 years ago
dependabot-preview[bot]
d10a8c7ee8
Bump faker from 2.7.0 to 2.8.0 ( #12531 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
1d2cb53ef4
Bump brakeman from 4.7.1 to 4.7.2 ( #12530 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.1...v4.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
8809655e09
Bump autoprefixer from 9.6.1 to 9.7.3 ( #12519 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.6.1 to 9.7.3.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.1...9.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
Yamagishi Kazutoshi
b01cb4701e
Update ESLint and RuboCop in Code Climate ( #12534 )
5 years ago