]> cat aescling's git repositories - mastodon.git/log
mastodon.git
5 years ago[Glitch] Add ability to filter audit log in admin UI
Eugen Rochko [Fri, 3 Apr 2020 11:06:34 +0000 (13:06 +0200)]
[Glitch] Add ability to filter audit log in admin UI

Port f65568f1d400be2e101bd8b533a1b53807f5c757 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 4 Apr 2020 19:47:37 +0000 (21:47 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoAdd explanation as to why unlocked accounts may have follow requests (#13385)
ThibG [Sat, 4 Apr 2020 17:02:10 +0000 (19:02 +0200)]
Add explanation as to why unlocked accounts may have follow requests (#13385)

* Add explanation as to why unlocked accounts may have follow requests

* Change wording to avoid “silenced”

5 years agoUpdate config.yml (#13379)
Shlee [Sat, 4 Apr 2020 13:52:42 +0000 (21:52 +0800)]
Update config.yml (#13379)

5 years agoUpdate Vagrant box to Bionic (#13384)
fuyu [Sat, 4 Apr 2020 13:47:48 +0000 (22:47 +0900)]
Update Vagrant box to Bionic (#13384)

5 years agoAdd ability to filter audit log in admin UI (#13381)
Eugen Rochko [Fri, 3 Apr 2020 11:06:34 +0000 (13:06 +0200)]
Add ability to filter audit log in admin UI (#13381)

5 years agoMerge pull request #1310 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 2 Apr 2020 20:17:29 +0000 (22:17 +0200)]
Merge pull request #1310 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Improve polls: option lengths & redesign
Sasha Sorokin [Thu, 2 Apr 2020 15:10:55 +0000 (22:10 +0700)]
[Glitch] Improve polls: option lengths & redesign

Port 37b3985bfac5ffdc8e452f92869dcdefb5c92594 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Improve toot clicking areas
Mélanie Chauvel (ariasuni) [Tue, 31 Mar 2020 17:40:23 +0000 (19:40 +0200)]
[Glitch] Improve toot clicking areas

Port part of 1fb92037e432913902a5e5c8a5b673b036d84cb8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
ThibG [Tue, 31 Mar 2020 12:10:18 +0000 (14:10 +0200)]
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW

Port cf1fa73347c9ca2b1c4f14521e990feba7509e2e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
Mélanie Chauvel (ariasuni) [Tue, 31 Mar 2020 10:39:50 +0000 (12:39 +0200)]
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI

Port be2f1597cf6b010a7ea0ffdc45550f87a7ae9dad  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
ThibG [Sat, 28 Mar 2020 16:59:45 +0000 (17:59 +0100)]
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI

Port front-end changes from 0d117c106aa72f78dd5cdd371849dd8ce3120198 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 2 Apr 2020 18:32:00 +0000 (20:32 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.

5 years agoBump rspec-rails from 3.9.1 to 4.0.0 (#13364)
dependabot-preview[bot] [Thu, 2 Apr 2020 16:54:41 +0000 (18:54 +0200)]
Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoImprove polls: option lengths & redesign (#13257)
Sasha Sorokin [Thu, 2 Apr 2020 15:10:55 +0000 (22:10 +0700)]
Improve polls: option lengths & redesign (#13257)

This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.

Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow.

5 years agoFix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)
Eugen Rochko [Thu, 2 Apr 2020 03:28:51 +0000 (05:28 +0200)]
Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)

Fix #13371

5 years agoFix returning results when searching for URL with non-zero offset (#13377)
Eugen Rochko [Thu, 2 Apr 2020 01:39:37 +0000 (03:39 +0200)]
Fix returning results when searching for URL with non-zero offset (#13377)

Fix #13083

5 years agoFix pinning a column in web UI sometimes redirecting out of web UI (#13376)
Eugen Rochko [Thu, 2 Apr 2020 01:12:10 +0000 (03:12 +0200)]
Fix pinning a column in web UI sometimes redirecting out of web UI (#13376)

Fix #13216

5 years agoBump json-ld from 3.1.1 to 3.1.2 (#13368)
dependabot-preview[bot] [Wed, 1 Apr 2020 01:05:33 +0000 (10:05 +0900)]
Bump json-ld from 3.1.1 to 3.1.2 (#13368)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)
dependabot-preview[bot] [Wed, 1 Apr 2020 01:05:26 +0000 (10:05 +0900)]
Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump bootsnap from 1.4.5 to 1.4.6 (#13369)
dependabot-preview[bot] [Wed, 1 Apr 2020 01:02:35 +0000 (10:02 +0900)]
Bump bootsnap from 1.4.5 to 1.4.6 (#13369)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump tty-prompt from 0.20.0 to 0.21.0 (#13366)
dependabot-preview[bot] [Wed, 1 Apr 2020 01:02:24 +0000 (10:02 +0900)]
Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump faker from 2.10.1 to 2.11.0 (#13363)
dependabot-preview[bot] [Wed, 1 Apr 2020 01:01:50 +0000 (10:01 +0900)]
Bump faker from 2.10.1 to 2.11.0 (#13363)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.11.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/commits/v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)
dependabot-preview[bot] [Wed, 1 Apr 2020 00:50:25 +0000 (09:50 +0900)]
Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.20 to 6.0.21.
- [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.20...v6.0.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix background jobs not using locks like they are supposed to (#13361)
Eugen Rochko [Tue, 31 Mar 2020 19:59:03 +0000 (21:59 +0200)]
Fix background jobs not using locks like they are supposed to (#13361)

Also:

- Fix locks not being removed when jobs go to the dead job queue
- Add UI for managing locks to the Sidekiq dashboard
- Remove unused Sidekiq workers

Fix #13349

5 years agoImprove toot clicking areas (#13327)
Mélanie Chauvel (ariasuni) [Tue, 31 Mar 2020 17:40:23 +0000 (19:40 +0200)]
Improve toot clicking areas (#13327)

* Make the area to the left “Show Thread” also expand the toot in Web UI

* Clicking the left part of a conversation with the avatars now opens it in Web UI

5 years agoFix re-sending of e-mail confirmation not being rate limited (#13360)
Eugen Rochko [Tue, 31 Mar 2020 16:20:48 +0000 (18:20 +0200)]
Fix re-sending of e-mail confirmation not being rate limited (#13360)

Fix #13330

5 years agoBump autoprefixer from 9.7.4 to 9.7.5 (#13338)
dependabot-preview[bot] [Tue, 31 Mar 2020 14:41:52 +0000 (23:41 +0900)]
Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [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.7.4...9.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)
dependabot-preview[bot] [Tue, 31 Mar 2020 14:37:30 +0000 (23:37 +0900)]
Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.4.
- [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.8.3...v7.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump babel-loader from 8.0.6 to 8.1.0 (#13333)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:15:37 +0000 (22:15 +0900)]
Bump babel-loader from 8.0.6 to 8.1.0 (#13333)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump yargs from 15.1.0 to 15.3.1 (#13334)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:15:06 +0000 (22:15 +0900)]
Bump yargs from 15.1.0 to 15.3.1 (#13334)

Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [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.1.0...v15.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:13:31 +0000 (22:13 +0900)]
Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [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.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump babel-jest from 25.1.0 to 25.2.4 (#13332)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:12:52 +0000 (22:12 +0900)]
Bump babel-jest from 25.1.0 to 25.2.4 (#13332)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump stringz from 2.0.0 to 2.1.0 (#13331)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:11:00 +0000 (22:11 +0900)]
Bump stringz from 2.0.0 to 2.1.0 (#13331)

Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump react from 16.12.0 to 16.13.1 (#13337)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:10:25 +0000 (22:10 +0900)]
Bump react from 16.12.0 to 16.13.1 (#13337)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [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.13.1/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)
dependabot-preview[bot] [Tue, 31 Mar 2020 13:09:14 +0000 (22:09 +0900)]
Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.5 to 1.1.6.
- [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.5...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix content warning being unnecessarily cleared when enabling/disabling CW (#13348)
ThibG [Tue, 31 Mar 2020 12:10:18 +0000 (14:10 +0200)]
Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)

5 years agoBump uuid from 3.4.0 to 7.0.2 (#13295)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:47:04 +0000 (12:47 +0200)]
Bump uuid from 3.4.0 to 7.0.2 (#13295)

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump parallel_tests from 2.30.1 to 2.32.0 (#13341)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:44:33 +0000 (12:44 +0200)]
Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix ImportsController param to permit :mode (#13347)
Takeshi Umeda [Tue, 31 Mar 2020 10:43:42 +0000 (19:43 +0900)]
Fix ImportsController param to permit :mode (#13347)

5 years agoBump better_errors from 2.5.1 to 2.6.0 (#13340)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:42:44 +0000 (12:42 +0200)]
Bump better_errors from 2.5.1 to 2.6.0 (#13340)

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump ox from 2.12.1 to 2.13.2 (#13342)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:42:17 +0000 (12:42 +0200)]
Bump ox from 2.12.1 to 2.13.2 (#13342)

Bumps [ox](https://github.com/ohler55/ox) from 2.12.1 to 2.13.2.
- [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.12.1...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump iso-639 from 0.2.8 to 0.3.5 (#13343)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:41:55 +0000 (12:41 +0200)]
Bump iso-639 from 0.2.8 to 0.3.5 (#13343)

Bumps [iso-639](https://github.com/xwmx/iso-639) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases)
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump oj from 3.10.3 to 3.10.5 (#13345)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:40:54 +0000 (12:40 +0200)]
Bump oj from 3.10.3 to 3.10.5 (#13345)

Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [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.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump pg from 1.2.2 to 1.2.3 (#13344)
dependabot-preview[bot] [Tue, 31 Mar 2020 10:40:33 +0000 (12:40 +0200)]
Bump pg from 1.2.2 to 1.2.3 (#13344)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.2 to 1.2.3.
- [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.2.2...v1.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)
Mélanie Chauvel (ariasuni) [Tue, 31 Mar 2020 10:39:50 +0000 (12:39 +0200)]
Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355)

5 years agoFix incorrect deletion of local accounts imported by overwriting (#13350)
Takeshi Umeda [Mon, 30 Mar 2020 18:32:34 +0000 (03:32 +0900)]
Fix incorrect deletion of local accounts imported by overwriting (#13350)

5 years agoFix 404 and 410 API errors being silently discarded in WebUI (#13279)
ThibG [Sat, 28 Mar 2020 16:59:45 +0000 (17:59 +0100)]
Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors

5 years agoMerge pull request #1308 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 28 Mar 2020 14:19:05 +0000 (15:19 +0100)]
Merge pull request #1308 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoFix OCR not working on Safari because of unsupported worker-src CSP (#13323)
ThibG [Fri, 27 Mar 2020 21:35:57 +0000 (22:35 +0100)]
Fix OCR not working on Safari because of unsupported worker-src CSP (#13323)

Fixes #13321

5 years agoBump brakeman from 4.7.2 to 4.8.0 (#13309)
dependabot-preview[bot] [Fri, 27 Mar 2020 21:35:49 +0000 (22:35 +0100)]
Bump brakeman from 4.7.2 to 4.8.0 (#13309)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.2 to 4.8.0.
- [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.2...v4.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix crash when posting with a CW but no text nor media
Thibaut Girka [Fri, 27 Mar 2020 21:28:39 +0000 (22:28 +0100)]
Fix crash when posting with a CW but no text nor media

5 years ago[Glitch] Fix frontend crash when deleting announcements
ThibG [Wed, 25 Mar 2020 21:39:55 +0000 (22:39 +0100)]
[Glitch] Fix frontend crash when deleting announcements

Port 858d0dd168b737a77506d6aa00f6ed582d0e33c6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Change poll option hover/active styling to be less confusing
ThibG [Wed, 25 Mar 2020 21:39:18 +0000 (22:39 +0100)]
[Glitch] Change poll option hover/active styling to be less confusing

Port beb80adb5150e50717852b39db7b534bc0da9534 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 27 Mar 2020 20:54:44 +0000 (21:54 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.

5 years agoFix Paperclip using deprecated URI.escape function (#13320)
ThibG [Thu, 26 Mar 2020 14:09:16 +0000 (15:09 +0100)]
Fix Paperclip using deprecated URI.escape function (#13320)

Monkey-patch Paperclip to perform URL escaping in a slightly more
appropriate way, and get rid of runtime deprecation warnings.

5 years agoBump webpack from 4.41.5 to 4.42.1 (#13319)
dependabot-preview[bot] [Thu, 26 Mar 2020 03:45:12 +0000 (12:45 +0900)]
Bump webpack from 4.41.5 to 4.42.1 (#13319)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)
dependabot-preview[bot] [Thu, 26 Mar 2020 03:44:47 +0000 (12:44 +0900)]
Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [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.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump react-select from 3.0.8 to 3.1.0 (#13296)
dependabot-preview[bot] [Thu, 26 Mar 2020 00:57:34 +0000 (09:57 +0900)]
Bump react-select from 3.0.8 to 3.1.0 (#13296)

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoChange `tootctl media remove-orphans` to work for all classes (#13316)
Eugen Rochko [Thu, 26 Mar 2020 00:56:41 +0000 (01:56 +0100)]
Change `tootctl media remove-orphans` to work for all classes (#13316)

Change `tootctl media lookup` to not use an interactive prompt

5 years agoBump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)
dependabot-preview[bot] [Thu, 26 Mar 2020 00:56:14 +0000 (09:56 +0900)]
Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [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/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump @babel/core from 7.8.6 to 7.9.0 (#13303)
dependabot-preview[bot] [Thu, 26 Mar 2020 00:55:32 +0000 (09:55 +0900)]
Bump @babel/core from 7.8.6 to 7.9.0 (#13303)

Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.0.
- [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.8.6...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)
dependabot-preview[bot] [Thu, 26 Mar 2020 00:54:46 +0000 (09:54 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.0.
- [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.8.3...v7.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)
dependabot-preview[bot] [Thu, 26 Mar 2020 00:53:31 +0000 (09:53 +0900)]
Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoNew Crowdin translations (#13064)
Eugen Rochko [Wed, 25 Mar 2020 22:17:14 +0000 (23:17 +0100)]
New Crowdin translations (#13064)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations devise.en.yml (Icelandic)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations activerecord.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

5 years agoBump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:49:27 +0000 (22:49 +0100)]
Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.60.1 to 1.61.1.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump discard from 1.1.0 to 1.2.0 (#13308)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:48:52 +0000 (22:48 +0100)]
Bump discard from 1.1.0 to 1.2.0 (#13308)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump rspec-rails from 3.9.0 to 3.9.1 (#13305)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:48:21 +0000 (22:48 +0100)]
Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump simplecov from 0.18.2 to 0.18.5 (#13310)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:47:35 +0000 (22:47 +0100)]
Bump simplecov from 0.18.2 to 0.18.5 (#13310)

Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump i18n-tasks from 0.9.30 to 0.9.31 (#13304)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:46:39 +0000 (22:46 +0100)]
Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump browser from 3.0.3 to 4.0.0 (#13307)
dependabot-preview[bot] [Wed, 25 Mar 2020 21:46:23 +0000 (22:46 +0100)]
Bump browser from 3.0.3 to 4.0.0 (#13307)

Bumps [browser](https://github.com/fnando/browser) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix media not being marked sensitive when client sets a CW but no text (#13277)
ThibG [Wed, 25 Mar 2020 21:40:58 +0000 (22:40 +0100)]
Fix media not being marked sensitive when client sets a CW but no text (#13277)

Mastodon enforces the “sensitive” flag on media attachments whenever a toot
is posted with a Content Warning. However, it does so *after* potentially
converting the Content Warning to toot text (when there is no toot text),
which leads to inconsistent and surprising behavior for API clients.
This commit fixes this inconsistency.

5 years agoFix frontend crash when deleting announcements (#13312)
ThibG [Wed, 25 Mar 2020 21:39:55 +0000 (22:39 +0100)]
Fix frontend crash when deleting announcements (#13312)

Refactor and fix #13283, which only worked in some cases.

5 years agoChange poll option hover/active styling to be less confusing (#13313)
ThibG [Wed, 25 Mar 2020 21:39:18 +0000 (22:39 +0100)]
Change poll option hover/active styling to be less confusing (#13313)

5 years agoMake sanitizer *not* add no-referrer etc. in local markdown toots if the link is...
Thibaut Girka [Sun, 22 Mar 2020 16:56:49 +0000 (17:56 +0100)]
Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”

5 years agoFix glitch-soc marking every link in toots as a tag
Thibaut Girka [Sun, 22 Mar 2020 15:59:29 +0000 (16:59 +0100)]
Fix glitch-soc marking every link in toots as a tag

Fixes #1281

5 years agoMerge pull request #1305 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 22 Mar 2020 16:59:47 +0000 (17:59 +0100)]
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix frontend crash when deleting announcements
Daniel Sockwell [Sat, 21 Mar 2020 02:10:42 +0000 (22:10 -0400)]
[Glitch] Fix frontend crash when deleting announcements

Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix regression in “Edit media” modal in web UI
ThibG [Tue, 10 Mar 2020 10:59:44 +0000 (11:59 +0100)]
[Glitch] Fix regression in “Edit media” modal in web UI

Port 90f3a0006243250ced6e7e192f81513d6b731b33 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Change the string "hidden" to "blocked" in WebUI
mayaeh [Mon, 9 Mar 2020 08:13:21 +0000 (17:13 +0900)]
[Glitch] Change the string "hidden" to "blocked" in WebUI

Port 310d729745ad34b1b039f2ec611b9bda5b73f252 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Change local media attachments to perform heavy processing asynchronously
Eugen Rochko [Sun, 8 Mar 2020 22:56:18 +0000 (23:56 +0100)]
[Glitch] Change local media attachments to perform heavy processing asynchronously

Port front-end part of 9660aa4543deff41c60d131e081137f84e771499 to glitch-soc

[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 22 Mar 2020 15:10:44 +0000 (16:10 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.

5 years agoBump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)
Yamagishi Kazutoshi [Sun, 22 Mar 2020 14:25:23 +0000 (23:25 +0900)]
Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)

5 years agoFix bookmarks also searchable (#13293)
Takeshi Umeda [Sun, 22 Mar 2020 01:40:03 +0000 (10:40 +0900)]
Fix bookmarks also searchable (#13293)

5 years agoBump sidekiq from 5.2.7 to 6.0.4 (#11727)
dependabot-preview[bot] [Sat, 21 Mar 2020 03:04:54 +0000 (12:04 +0900)]
Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

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

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years ago[Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)
dependabot-preview[bot] [Sat, 21 Mar 2020 02:23:25 +0000 (03:23 +0100)]
[Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoMigrate Rails ujs as required for Rails 6 Upgrade. (#13280)
Shlee [Sat, 21 Mar 2020 02:14:50 +0000 (10:14 +0800)]
Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)

* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js

5 years agoAdd link to bookmarks in web UI dropdown (#13273)
mayaeh [Sat, 21 Mar 2020 02:14:28 +0000 (11:14 +0900)]
Add link to bookmarks in web UI dropdown (#13273)

5 years agoMake bookmarks also searchable (#13271)
Jeong Arm [Sat, 21 Mar 2020 02:14:10 +0000 (11:14 +0900)]
Make bookmarks also searchable (#13271)

5 years agoFix frontend crash when deleting announcements (#13283)
Daniel Sockwell [Sat, 21 Mar 2020 02:10:42 +0000 (22:10 -0400)]
Fix frontend crash when deleting announcements (#13283)

This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)

As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.

This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present.

5 years agoDecommission support for Ruby 2.4 (#13287)
Shlee [Sat, 21 Mar 2020 02:10:24 +0000 (10:10 +0800)]
Decommission support for Ruby 2.4 (#13287)

* Update Gemfile

* Update README.md

5 years agoFix reported accounts not being whitelisted when resolving a spamcheck report (#13289)
ThibG [Sat, 21 Mar 2020 02:08:09 +0000 (03:08 +0100)]
Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

5 years agoBump capistrano from 3.11.2 to 3.12.1 (#13264)
dependabot-preview[bot] [Wed, 18 Mar 2020 12:48:03 +0000 (21:48 +0900)]
Bump capistrano from 3.11.2 to 3.12.1 (#13264)

* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years agoBump webmock from 3.8.0 to 3.8.3 (#13265)
dependabot-preview[bot] [Wed, 18 Mar 2020 11:16:46 +0000 (20:16 +0900)]
Bump webmock from 3.8.0 to 3.8.3 (#13265)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.3.
- [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.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)
dependabot-preview[bot] [Wed, 18 Mar 2020 11:02:34 +0000 (20:02 +0900)]
Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump simple_form from 5.0.1 to 5.0.2 (#13231)
dependabot-preview[bot] [Wed, 18 Mar 2020 11:01:35 +0000 (20:01 +0900)]
Bump simple_form from 5.0.1 to 5.0.2 (#13231)

Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump json-ld from 3.1.0 to 3.1.1 (#13230)
dependabot-preview[bot] [Wed, 18 Mar 2020 11:00:20 +0000 (20:00 +0900)]
Bump json-ld from 3.1.0 to 3.1.1 (#13230)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump redis from 2.8.0 to 3.0.2 (#13102)
dependabot-preview[bot] [Wed, 18 Mar 2020 10:55:31 +0000 (19:55 +0900)]
Bump redis from 2.8.0 to 3.0.2 (#13102)

Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump mkdirp from 0.5.1 to 1.0.3 (#12979)
dependabot-preview[bot] [Wed, 18 Mar 2020 10:45:37 +0000 (19:45 +0900)]
Bump mkdirp from 0.5.1 to 1.0.3 (#12979)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump sass from 1.25.0 to 1.26.3 (#13263)
dependabot-preview[bot] [Wed, 18 Mar 2020 10:44:21 +0000 (19:44 +0900)]
Bump sass from 1.25.0 to 1.26.3 (#13263)

Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.3.
- [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.25.0...1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>