]> cat aescling's git repositories - mastodon.git/log
mastodon.git
5 years ago[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and...
ThibG [Sun, 12 Apr 2020 11:38:00 +0000 (13:38 +0200)]
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists

Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 12 Apr 2020 14:50:27 +0000 (16:50 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.

5 years agoincrease the postgres container shm_size from 64mb to 256mb (#13451)
Matej Ľach [Sun, 12 Apr 2020 14:41:54 +0000 (15:41 +0100)]
increase the postgres container shm_size from 64mb to 256mb (#13451)

5 years agoFix API footer link in Web UI (#13441)
Leonie [Sun, 12 Apr 2020 11:38:14 +0000 (13:38 +0200)]
Fix API footer link in Web UI (#13441)

Co-authored-by: koyu <me@koyu.spac>
5 years agoFix WebUI pagination of following, followers, follow requests, blocks and mutes lists...
ThibG [Sun, 12 Apr 2020 11:38:00 +0000 (13:38 +0200)]
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)

* Fix following, followers and follow requests pagination

* Fix pagination of blocks and mutes

5 years agoAdd new vagrant log files to .gitignore (#13442)
fuyu [Sun, 12 Apr 2020 11:37:34 +0000 (20:37 +0900)]
Add new vagrant log files to .gitignore (#13442)

* Update .gitignore

* Update .gitignore

Co-Authored-By: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
5 years agoClean up some dead code
Thibaut Girka [Fri, 10 Apr 2020 08:42:31 +0000 (10:42 +0200)]
Clean up some dead code

5 years agoFix translation platform to Crowdin (#13443)
Yamagishi Kazutoshi [Fri, 10 Apr 2020 06:24:23 +0000 (15:24 +0900)]
Fix translation platform to Crowdin (#13443)

5 years agoBump capistrano-bundler from 1.3.0 to 1.6.0 (#13416)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:34:54 +0000 (03:34 +0900)]
Bump capistrano-bundler from 1.3.0 to 1.6.0 (#13416)

Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 1.3.0 to 1.6.0.
- [Release notes](https://github.com/capistrano/bundler/releases)
- [Changelog](https://github.com/capistrano/bundler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v1.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 elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:33:12 +0000 (03:33 +0900)]
Bump elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419)

Bumps [elasticsearch-dsl](https://github.com/elasticsearch/elasticsearch-ruby) from 0.1.8 to 0.1.9.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v0.1.8...v0.1.9)

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 annotate from 3.0.3 to 3.1.1 (#13417)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:32:39 +0000 (03:32 +0900)]
Bump annotate from 3.0.3 to 3.1.1 (#13417)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.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 agoFix deprecated use of createBrowserHistory
Thibaut Girka [Thu, 9 Apr 2020 14:12:28 +0000 (16:12 +0200)]
Fix deprecated use of createBrowserHistory

5 years agoBump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:22:50 +0000 (03:22 +0900)]
Bump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409)

Bumps [babel-plugin-emotion](https://github.com/emotion-js/emotion) from 10.0.19 to 10.0.33.
- [Release notes](https://github.com/emotion-js/emotion/releases)
- [Changelog](https://github.com/emotion-js/emotion/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emotion-js/emotion/compare/babel-plugin-emotion@10.0.19...babel-plugin-emotion@10.0.33)

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 abab from 2.0.0 to 2.0.3 (#13408)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:17:48 +0000 (03:17 +0900)]
Bump abab from 2.0.0 to 2.0.3 (#13408)

Bumps [abab](https://github.com/jsdom/abab) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/jsdom/abab/releases)
- [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsdom/abab/compare/v2.0.0...2.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 es-abstract from 1.17.0 to 1.17.5 (#13410)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:16:14 +0000 (03:16 +0900)]
Bump es-abstract from 1.17.0 to 1.17.5 (#13410)

Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.0 to 1.17.5.
- [Release notes](https://github.com/ljharb/es-abstract/releases)
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.0...v1.17.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 sshpk from 1.16.0 to 1.16.1 (#13412)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:15:10 +0000 (03:15 +0900)]
Bump sshpk from 1.16.0 to 1.16.1 (#13412)

Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.16.0...v1.16.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 thunky from 1.0.3 to 1.1.0 (#13411)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:13:11 +0000 (03:13 +0900)]
Bump thunky from 1.0.3 to 1.1.0 (#13411)

Bumps [thunky](https://github.com/mafintosh/thunky) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/mafintosh/thunky/releases)
- [Commits](https://github.com/mafintosh/thunky/compare/v1.0.3...v1.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 intl-format-cache from 2.1.0 to 2.2.9 (#13413)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:12:30 +0000 (03:12 +0900)]
Bump intl-format-cache from 2.1.0 to 2.2.9 (#13413)

Bumps [intl-format-cache](https://github.com/formatjs/formatjs) from 2.1.0 to 2.2.9.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-utils@2.1.0...intl-format-cache@2.2.9)

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 escodegen from 1.11.0 to 1.14.1 (#13414)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:10:41 +0000 (03:10 +0900)]
Bump escodegen from 1.11.0 to 1.14.1 (#13414)

Bumps [escodegen](https://github.com/estools/escodegen) from 1.11.0 to 1.14.1.
- [Release notes](https://github.com/estools/escodegen/releases)
- [Commits](https://github.com/estools/escodegen/compare/v1.11.0...v1.14.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 istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:08:52 +0000 (03:08 +0900)]
Bump istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415)

Bumps [istanbul-lib-instrument](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-instrument) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/master/packages/istanbul-lib-instrument/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-instrument@3.3.0/packages/istanbul-lib-instrument)

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 prop-types-extra from 1.1.0 to 1.1.1 (#13407)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:07:55 +0000 (03:07 +0900)]
Bump prop-types-extra from 1.1.0 to 1.1.1 (#13407)

Bumps [prop-types-extra](https://github.com/react-bootstrap/prop-types-extra) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/react-bootstrap/prop-types-extra/releases)
- [Changelog](https://github.com/react-bootstrap/prop-types-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/prop-types-extra/compare/v1.1.0...v1.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 public_suffix from 4.0.3 to 4.0.4 (#13418)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:01:54 +0000 (03:01 +0900)]
Bump public_suffix from 4.0.3 to 4.0.4 (#13418)

Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.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 bcrypt from 3.1.12 to 3.1.13 (#13420)
dependabot-preview[bot] [Wed, 8 Apr 2020 17:59:21 +0000 (02:59 +0900)]
Bump bcrypt from 3.1.12 to 3.1.13 (#13420)

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.12 to 3.1.13.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.12...v3.1.13)

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 loofah from 2.4.0 to 2.5.0 (#13422)
dependabot-preview[bot] [Wed, 8 Apr 2020 17:58:12 +0000 (02:58 +0900)]
Bump loofah from 2.4.0 to 2.5.0 (#13422)

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.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 styling of polls in JS-less fallback on public pages (#13436)
ThibG [Tue, 7 Apr 2020 16:21:58 +0000 (18:21 +0200)]
Fix styling of polls in JS-less fallback on public pages (#13436)

5 years agoMerge pull request #1312 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 6 Apr 2020 19:44:34 +0000 (21:44 +0200)]
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoFix regression in `tootctl media remove-orphans` (#13405)
Eugen Rochko [Mon, 6 Apr 2020 12:11:47 +0000 (14:11 +0200)]
Fix regression in `tootctl media remove-orphans` (#13405)

Fix #13401

5 years agoFix trying to delete already deleted file when post-processing (#13406)
Eugen Rochko [Mon, 6 Apr 2020 12:11:22 +0000 (14:11 +0200)]
Fix trying to delete already deleted file when post-processing (#13406)

Fix #13403

5 years agoIncrease dependabot dependencies scope from security-only. (#13400)
Shlee [Mon, 6 Apr 2020 07:43:55 +0000 (15:43 +0800)]
Increase dependabot dependencies scope from security-only. (#13400)

* Update config.yml

* Update config.yml

* Update config.yml

* Update config.yml

5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 5 Apr 2020 16:32:06 +0000 (18:32 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.

5 years agoUpdate CHANGELOG.md (#13397)
Eugen Rochko [Sun, 5 Apr 2020 13:18:41 +0000 (15:18 +0200)]
Update CHANGELOG.md (#13397)

5 years agoNew Crowdin translations (#13317)
Eugen Rochko [Sun, 5 Apr 2020 12:56:18 +0000 (14:56 +0200)]
New Crowdin translations (#13317)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations

5 years agoAdd rate limit for reporting (#13390)
Eugen Rochko [Sun, 5 Apr 2020 12:40:08 +0000 (14:40 +0200)]
Add rate limit for reporting (#13390)

5 years agoFix “Show more” not switching to “Show less” on public pages (#13174)
ThibG [Sun, 5 Apr 2020 12:02:22 +0000 (14:02 +0200)]
Fix “Show more” not switching to “Show less” on public pages (#13174)

* Fix “Show more” not switching to “Show less” on public pages

Fixes #13169

* Fix initial text of CW button on public pages when CW are unfolded by default

5 years agoUpdate .ruby-version (#13395)
Shlee [Sun, 5 Apr 2020 11:58:43 +0000 (19:58 +0800)]
Update .ruby-version (#13395)

5 years ago[Security] Update Dockerfile for Ruby 2.6.6 (#13393)
Shlee [Sun, 5 Apr 2020 10:52:07 +0000 (18:52 +0800)]
[Security] Update Dockerfile for Ruby 2.6.6 (#13393)

5 years agoFix PostgreSQL load when linking in announcements (#13250)
ThibG [Sun, 5 Apr 2020 10:51:22 +0000 (12:51 +0200)]
Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review

5 years agoBump version to 3.1.3 (#13389)
Eugen Rochko [Sun, 5 Apr 2020 04:23:46 +0000 (06:23 +0200)]
Bump version to 3.1.3 (#13389)

5 years agoMerge pull request #1311 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 4 Apr 2020 22:16:23 +0000 (00:16 +0200)]
Merge pull request #1311 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoBump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)
Eugen Rochko [Sat, 4 Apr 2020 21:24:59 +0000 (23:24 +0200)]
Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387)

* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3

5 years agoFix admin audit log crash due to glitch-soc theming changes
Thibaut Girka [Sat, 4 Apr 2020 21:15:08 +0000 (23:15 +0200)]
Fix admin audit log crash due to glitch-soc theming changes

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

Port d3ff06a3205130fa10ffc5d736e8206a9725b5df to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
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>