about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-04-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-04-17Fix not being able to vote (#13490)ThibG
Fix regression introduced by ab8d7c0680d7f75826277be4c8eea1ebd396be8a
2020-04-17[Glitch] Fix Poll fetchPoll action not being debounced.Gurgen Hayrapetyan
Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-04-17Fix admin actions log crash when displaying updates of deleted announcements ↵ThibG
(#13489) Fixes #13487
2020-04-17Fix search not working due to proxy settings when using hidden services (#13488)Eugen Rochko
Fix #13484
2020-04-16Fix Poll fetchPoll action not being debounced. (#13485)Gurgen Hayrapetyan
* Fix Poll fetchPoll action not being debounced. * Fix unused import in the Poll component
2020-04-16Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable ↵Takeshi Umeda
(#13482)
2020-04-16Fix migration 20200407202420_migrate_unavailable_inboxes (#13481)Takeshi Umeda
2020-04-15Fix confusing error when failing to add an alias to an unknown account (#13480)ThibG
Follow-up to #13452, fixing broken `uri.nil?` test. Also remove the separate check for `uri` presence, as that would result in a “Please review 2 errors below” while only one would be listed.
2020-04-15Change delivery failure tracking to work with hostnames instead of URLs (#13437)Eugen Rochko
2020-04-15Merge pull request #1317 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-04-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.
2020-04-15Fix “Email changed” notification sometimes having wrong e-mail (#13475)ThibG
* Fix “Email changed” notification sometimes having wrong e-mail Fixes #6778 The root of the issue is that `send_devise_notification` was called before the changes were properly commited to the database, causing the mailer to pick previous values if running too early. Devise's documentation provides guidance on how to handle that[1][2], however, I have found it to not be working, as the following happens, in that order: - `send_devise_notification` is called for the `email_changed` notification. In that case, `changed?` is false and `saved_changes?` is true, so if we use the former, we have the same issue. - the `after_commit` hook is called - `send_devise_notification` is called for the `confirmation_instructions` notification. In that case, `changed?` is still false, and `saved_changes?` still true, so if we use the latter, that second notification email is simply not going to be sent (as we would be queuing the notification *after* executing the after_commit hook). This is because it may be called from either an `after_update` or `after_commit` hook, the difference not being a call to `save` but the transaction actually being committed to the database. This may arguably be a bug in Devise, or Devise's notification. The proposed workaround is inspired by Devise's documentation but checks whether a transaction is open to make the call whether to immediately send the notification or defer it to the `after_commit` hook. [1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification [2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194 * Fix cases when sending notifications without changing the model * Defer sending if and only if in transaction including current record
2020-04-14Bump watchpack from 1.6.0 to 1.6.1 (#13462)dependabot-preview[bot]
Bumps [watchpack](https://github.com/webpack/watchpack) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/webpack/watchpack/releases) - [Commits](https://github.com/webpack/watchpack/compare/v1.6.0...v1.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-13Bump regexp_parser from 1.6.0 to 1.7.0 (#13460)dependabot-preview[bot]
Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ammar/regexp_parser/releases) - [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/ammar/regexp_parser/compare/v1.6.0...v1.7.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-13Bump rubocop-rails from 2.4.2 to 2.5.2 (#13459)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.2 to 2.5.2. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.2) 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-13Bump capistrano from 3.12.1 to 3.13.0 (#13455)dependabot-preview[bot]
Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.12.1 to 3.13.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.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-13Bump elasticsearch from 7.5.0 to 7.6.0 (#13458)dependabot-preview[bot]
Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby) from 7.5.0 to 7.6.0. - [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases) - [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v7.6.0/CHANGELOG.md) - [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v7.5.0...v7.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-13Bump cssom from 0.3.4 to 0.3.8 (#13461)dependabot-preview[bot]
Bumps [cssom](https://github.com/NV/CSSOM) from 0.3.4 to 0.3.8. - [Release notes](https://github.com/NV/CSSOM/releases) - [Commits](https://github.com/NV/CSSOM/commits) 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-13Bump regexp.prototype.flags from 1.2.0 to 1.3.0 (#13468)dependabot-preview[bot]
Bumps [regexp.prototype.flags](https://github.com/es-shims/RegExp.prototype.flags) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/es-shims/RegExp.prototype.flags/releases) - [Changelog](https://github.com/es-shims/RegExp.prototype.flags/blob/master/CHANGELOG.md) - [Commits](https://github.com/es-shims/RegExp.prototype.flags/compare/v1.2.0...v1.3.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-13Bump fabrication from 2.21.0 to 2.21.1 (#13453)dependabot-preview[bot]
Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.21.0 to 2.21.1. - [Release notes](https://github.com/paulelliott/fabrication/releases) - [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown) - [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.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-13Bump aws-sdk-s3 from 1.61.1 to 1.61.2 (#13456)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.1 to 1.61.2. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-13Bump mousetrap from 1.6.2 to 1.6.5 (#13466)dependabot-preview[bot]
Bumps [mousetrap](https://github.com/ccampbell/mousetrap) from 1.6.2 to 1.6.5. - [Release notes](https://github.com/ccampbell/mousetrap/releases) - [Commits](https://github.com/ccampbell/mousetrap/compare/1.6.2...1.6.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-13Bump mkdirp from 1.0.3 to 1.0.4 (#13463)dependabot-preview[bot]
Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/isaacs/node-mkdirp/releases) - [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.3...v1.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-13Bump unicode-match-property-value-ecmascript from 1.1.0 to 1.2.0 (#13464)dependabot-preview[bot]
Bumps [unicode-match-property-value-ecmascript](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/releases) - [Commits](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/compare/v1.1.0...v1.2.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-13Bump picomatch from 2.0.7 to 2.2.2 (#13465)dependabot-preview[bot]
Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.0.7 to 2.2.2. - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/picomatch/compare/2.0.7...2.2.2) 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-13Bump autoprefixer from 9.7.5 to 9.7.6 (#13467)dependabot-preview[bot]
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.5 to 9.7.6. - [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.5...9.7.6) 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-13Bump htmlparser2 from 3.10.0 to 3.10.1 (#13469)dependabot-preview[bot]
Bumps [htmlparser2](https://github.com/fb55/htmlparser2) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/fb55/htmlparser2/releases) - [Commits](https://github.com/fb55/htmlparser2/compare/v3.10.0...v3.10.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-13Fix account aliases page (#13452)ThibG
* Fix error not being displayed when adding an account alias, add error for self-references Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> * Add “You have no aliases.” note in confusing empty aliases table Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
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>