about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-04-12Merge pull request #1316 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-04-12[Glitch] Fix WebUI pagination of following, followers, follow requests, ↵ThibG
blocks and mutes lists Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.
2020-04-12increase the postgres container shm_size from 64mb to 256mb (#13451)Matej Ľach
2020-04-12Fix API footer link in Web UI (#13441)Leonie
Co-authored-by: koyu <me@koyu.spac>
2020-04-12Fix WebUI pagination of following, followers, follow requests, blocks and ↵ThibG
mutes lists (#13445) * Fix following, followers and follow requests pagination * Fix pagination of blocks and mutes
2020-04-12Add new vagrant log files to .gitignore (#13442)fuyu
* Update .gitignore * Update .gitignore Co-Authored-By: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-04-10Clean up some dead codeThibaut Girka
2020-04-10Fix translation platform to Crowdin (#13443)Yamagishi Kazutoshi
2020-04-10Bump capistrano-bundler from 1.3.0 to 1.6.0 (#13416)dependabot-preview[bot]
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-10Bump elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419)dependabot-preview[bot]
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-10Bump annotate from 3.0.3 to 3.1.1 (#13417)dependabot-preview[bot]
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-09Fix deprecated use of createBrowserHistoryThibaut Girka
2020-04-09Bump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409)dependabot-preview[bot]
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-09Bump abab from 2.0.0 to 2.0.3 (#13408)dependabot-preview[bot]
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-09Bump es-abstract from 1.17.0 to 1.17.5 (#13410)dependabot-preview[bot]
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-09Bump sshpk from 1.16.0 to 1.16.1 (#13412)dependabot-preview[bot]
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-09Bump thunky from 1.0.3 to 1.1.0 (#13411)dependabot-preview[bot]
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-09Bump intl-format-cache from 2.1.0 to 2.2.9 (#13413)dependabot-preview[bot]
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-09Bump escodegen from 1.11.0 to 1.14.1 (#13414)dependabot-preview[bot]
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-09Bump istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415)dependabot-preview[bot]
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-09Bump prop-types-extra from 1.1.0 to 1.1.1 (#13407)dependabot-preview[bot]
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-09Bump public_suffix from 4.0.3 to 4.0.4 (#13418)dependabot-preview[bot]
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-09Bump bcrypt from 3.1.12 to 3.1.13 (#13420)dependabot-preview[bot]
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-09Bump loofah from 2.4.0 to 2.5.0 (#13422)dependabot-preview[bot]
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-07Fix styling of polls in JS-less fallback on public pages (#13436)ThibG
2020-04-06Merge pull request #1312 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-04-06Fix regression in `tootctl media remove-orphans` (#13405)Eugen Rochko
Fix #13401
2020-04-06Fix trying to delete already deleted file when post-processing (#13406)Eugen Rochko
Fix #13403
2020-04-06Increase dependabot dependencies scope from security-only. (#13400)Shlee
* Update config.yml * Update config.yml * Update config.yml * Update config.yml
2020-04-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-05Update CHANGELOG.md (#13397)Eugen Rochko
2020-04-05New Crowdin translations (#13317)Eugen Rochko
* 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-05Add rate limit for reporting (#13390)Eugen Rochko
2020-04-05Fix “Show more” not switching to “Show less” on public pages (#13174)ThibG
* 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-05Update .ruby-version (#13395)Shlee
2020-04-05[Security] Update Dockerfile for Ruby 2.6.6 (#13393)Shlee
2020-04-05Fix PostgreSQL load when linking in announcements (#13250)ThibG
* 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-05Bump version to 3.1.3 (#13389)Eugen Rochko
2020-04-05Merge pull request #1311 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-04-04Bump 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
* 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-04Fix admin audit log crash due to glitch-soc theming changesThibaut Girka
2020-04-04[Glitch] Add explanation as to why unlocked accounts may have follow requestsThibG
Port d3ff06a3205130fa10ffc5d736e8206a9725b5df to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04[Glitch] Add ability to filter audit log in admin UIEugen Rochko
Port f65568f1d400be2e101bd8b533a1b53807f5c757 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-04-04Add explanation as to why unlocked accounts may have follow requests (#13385)ThibG
* Add explanation as to why unlocked accounts may have follow requests * Change wording to avoid “silenced”
2020-04-04Update config.yml (#13379)Shlee
2020-04-04Update Vagrant box to Bionic (#13384)fuyu
2020-04-03Add ability to filter audit log in admin UI (#13381)Eugen Rochko
2020-04-02Merge pull request #1310 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes