e51cbbbf5b
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>
2020-04-12 13:37:34 +02:00
51bbf0b68d
Clean up some dead code
2020-04-10 14:47:06 +02:00
44a19fd96d
Fix translation platform to Crowdin ( #13443 )
2020-04-10 08:24:23 +02:00
f24ee2484b
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>
2020-04-10 03:34:54 +09:00
7faf5e7385
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>
2020-04-10 03:33:12 +09:00
42389bda80
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>
2020-04-10 03:32:39 +09:00
5d2cdeb225
Fix deprecated use of createBrowserHistory
2020-04-09 17:03:05 +02:00
7007bb0e2f
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>
2020-04-09 03:22:50 +09:00
3c44bbb347
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>
2020-04-09 03:17:48 +09:00
0e0e73ea9c
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>
2020-04-09 03:16:14 +09:00
317ae0e5db
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>
2020-04-09 03:15:10 +09:00
d1502890ab
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>
2020-04-09 03:13:11 +09:00
f0432c04a0
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>
2020-04-09 03:12:30 +09:00
6b8fe0f8db
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>
2020-04-09 03:10:41 +09:00
edcbbbe8db
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>
2020-04-09 03:08:52 +09:00
25a7bf2259
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>
2020-04-09 03:07:55 +09:00
59c861e815
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>
2020-04-09 03:01:54 +09:00
a2e743bf98
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>
2020-04-09 02:59:21 +09:00
7674e9ad12
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>
2020-04-09 02:58:12 +09:00
9d24bcc5e6
Fix styling of polls in JS-less fallback on public pages ( #13436 )
2020-04-07 18:21:58 +02:00
c47be5bd86
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-06 21:44:34 +02:00
c99bc5d51b
Fix regression in `tootctl media remove-orphans` ( #13405 )
...
Fix #13401
2020-04-06 14:11:47 +02:00
0773a512ac
Fix trying to delete already deleted file when post-processing ( #13406 )
...
Fix #13403
2020-04-06 14:11:22 +02:00
2924cef2f8
Increase dependabot dependencies scope from security-only. ( #13400 )
...
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
2020-04-06 09:43:55 +02:00
9101254d0a
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.
2020-04-05 18:32:06 +02:00
85f0e0a606
Update CHANGELOG.md ( #13397 )
2020-04-05 15:18:41 +02:00
510db5eef9
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
2020-04-05 14:56:18 +02:00
c9efb400b4
Add rate limit for reporting ( #13390 )
2020-04-05 14:40:08 +02:00
eea0cd8fad
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
2020-04-05 14:02:22 +02:00
e96146e320
Update .ruby-version ( #13395 )
2020-04-05 13:58:43 +02:00
e4a1ebf721
[Security] Update Dockerfile for Ruby 2.6.6 ( #13393 )
2020-04-05 12:52:07 +02:00
89e28c7674
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
2020-04-05 12:51:22 +02:00
a889756dd5
Bump version to 3.1.3 ( #13389 )
2020-04-05 06:23:46 +02:00
6e426267a7
Merge pull request #1311 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-05 00:16:23 +02:00
5c2e63acd5
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
2020-04-04 23:24:59 +02:00
ec6464f8d0
Fix admin audit log crash due to glitch-soc theming changes
2020-04-04 23:15:08 +02:00
fd7a37c371
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port d3ff06a320
2020-04-04 21:59:49 +02:00
7d5b43d8bb
[Glitch] Add ability to filter audit log in admin UI
...
Port f65568f1d4
2020-04-04 21:53:31 +02:00
8fef96cbf5
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-04 21:47:37 +02:00
d3ff06a320
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”
2020-04-04 19:02:10 +02:00
ae7e3f0933
Update config.yml ( #13379 )
2020-04-04 15:52:42 +02:00
51f2315248
Update Vagrant box to Bionic ( #13384 )
2020-04-04 15:47:48 +02:00
f65568f1d4
Add ability to filter audit log in admin UI ( #13381 )
2020-04-03 13:06:34 +02:00
5c5317041f
Merge pull request #1310 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-02 22:17:29 +02:00
b367dd713e
[Glitch] Improve polls: option lengths & redesign
...
Port 37b3985bfa
2020-04-02 20:52:53 +02:00
2e337d850f
[Glitch] Improve toot clicking areas
...
Port part of 1fb92037e4
2020-04-02 20:49:43 +02:00
9175ebf20c
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port cf1fa73347
2020-04-02 20:45:46 +02:00
dcf841545d
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port be2f1597cf
2020-04-02 20:45:03 +02:00
3eede6f64b
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 0d117c106a
2020-04-02 20:39:44 +02:00
f3eff922a3
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.
2020-04-02 20:32:00 +02:00
fuyu
Thibaut Girka
Yamagishi Kazutoshi
dependabot-preview[bot]
Eugen Rochko
Shlee
Sasha Sorokin
Mélanie Chauvel (ariasuni)