ThibG
81ef26b67d
[Glitch] Fix not being able to vote
...
Port e12a5635da
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 22:04:10 +02:00
Thibaut Girka
28bdecf004
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 22:02:55 +02:00
Thibaut Girka
7ee65ba15e
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 22:02:55 +02:00
ThibG
0f3317fbe2
Fix not being able to vote ( #13490 )
...
Fix regression introduced by 53f9f8a4ce
2020-04-17 21:54:25 +02:00
ThibG
e12a5635da
Fix not being able to vote ( #13490 )
...
Fix regression introduced by ab8d7c0680
2020-04-17 21:54:25 +02:00
Gurgen Hayrapetyan
f451095c04
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port 53f9f8a4ce
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 20:20:06 +02:00
Gurgen Hayrapetyan
4849752a9c
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port ab8d7c0680
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17 20:20:06 +02:00
Thibaut Girka
43a9ed3de8
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 20:16:24 +02:00
Thibaut Girka
81e49ba5c6
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-17 20:16:24 +02:00
ThibG
a93fc74d31
Fix admin actions log crash when displaying updates of deleted announcements ( #13489 )
...
Fixes #13487
2020-04-17 19:54:58 +02:00
ThibG
89077fb657
Fix admin actions log crash when displaying updates of deleted announcements ( #13489 )
...
Fixes #13487
2020-04-17 19:54:58 +02:00
Eugen Rochko
efd5db8f21
Fix search not working due to proxy settings when using hidden services ( #13488 )
...
Fix #13484
2020-04-17 15:14:24 +02:00
Eugen Rochko
d18d6c29f3
Fix search not working due to proxy settings when using hidden services ( #13488 )
...
Fix #13484
2020-04-17 15:14:24 +02:00
Gurgen Hayrapetyan
53f9f8a4ce
Fix Poll fetchPoll action not being debounced. ( #13485 )
...
* Fix Poll fetchPoll action not being debounced.
* Fix unused import in the Poll component
2020-04-16 20:16:20 +02:00
Gurgen Hayrapetyan
ab8d7c0680
Fix Poll fetchPoll action not being debounced. ( #13485 )
...
* Fix Poll fetchPoll action not being debounced.
* Fix unused import in the Poll component
2020-04-16 20:16:20 +02:00
Takeshi Umeda
8eca96eb77
Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable ( #13482 )
2020-04-16 08:04:10 +02:00
Takeshi Umeda
04c8d825f6
Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable ( #13482 )
2020-04-16 08:04:10 +02:00
Takeshi Umeda
1eb59ace5c
Fix migration 20200407202420_migrate_unavailable_inboxes ( #13481 )
2020-04-16 08:03:24 +02:00
Takeshi Umeda
ea200a178e
Fix migration 20200407202420_migrate_unavailable_inboxes ( #13481 )
2020-04-16 08:03:24 +02:00
ThibG
c162748a14
Fix confusing error when failing to add an alias to an unknown account ( #13480 )
...
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-15 20:33:53 +02:00
ThibG
3825e1943f
Fix confusing error when failing to add an alias to an unknown account ( #13480 )
...
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-15 20:33:53 +02:00
Eugen Rochko
2d3219549b
Change delivery failure tracking to work with hostnames instead of URLs ( #13437 )
2020-04-15 20:33:24 +02:00
Eugen Rochko
5edff32733
Change delivery failure tracking to work with hostnames instead of URLs ( #13437 )
2020-04-15 20:33:24 +02:00
ThibG
3e10e0519d
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-15 18:24:41 +02:00
ThibG
5fdd5eef5a
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-04-15 18:24:41 +02:00
Thibaut Girka
f9d5864e04
Merge branch 'master' into glitch-soc/merge-upstream
...
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-15 17:07:49 +02:00
Thibaut Girka
66ad30db48
Merge branch 'master' into glitch-soc/merge-upstream
...
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-15 17:07:49 +02:00
ThibG
add34dd132
Fix “Email changed” notification sometimes having wrong e-mail ( #13475 )
...
* 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]: 406915cb78/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-15 16:13:44 +02:00
ThibG
5524258da9
Fix “Email changed” notification sometimes having wrong e-mail ( #13475 )
...
* 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]: 406915cb78/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-15 16:13:44 +02:00
dependabot-preview[bot]
7ebaef064e
Bump watchpack from 1.6.0 to 1.6.1 ( #13462 )
...
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-14 00:35:20 +09:00
dependabot-preview[bot]
80c04b2819
Bump watchpack from 1.6.0 to 1.6.1 ( #13462 )
...
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-14 00:35:20 +09:00
dependabot-preview[bot]
54fb8967cd
Bump regexp_parser from 1.6.0 to 1.7.0 ( #13460 )
...
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-13 23:40:22 +09:00
dependabot-preview[bot]
516bdc66ba
Bump regexp_parser from 1.6.0 to 1.7.0 ( #13460 )
...
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-13 23:40:22 +09:00
dependabot-preview[bot]
34d4ff13a6
Bump rubocop-rails from 2.4.2 to 2.5.2 ( #13459 )
...
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-13 23:36:57 +09:00
dependabot-preview[bot]
1170073a67
Bump rubocop-rails from 2.4.2 to 2.5.2 ( #13459 )
...
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-13 23:36:57 +09:00
dependabot-preview[bot]
d5002774dd
Bump capistrano from 3.12.1 to 3.13.0 ( #13455 )
...
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-13 23:33:53 +09:00
dependabot-preview[bot]
00df65df77
Bump capistrano from 3.12.1 to 3.13.0 ( #13455 )
...
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-13 23:33:53 +09:00
dependabot-preview[bot]
1698ba611e
Bump elasticsearch from 7.5.0 to 7.6.0 ( #13458 )
...
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-13 23:21:31 +09:00
dependabot-preview[bot]
bf421bbc65
Bump elasticsearch from 7.5.0 to 7.6.0 ( #13458 )
...
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-13 23:21:31 +09:00
dependabot-preview[bot]
d5a9ea4f45
Bump cssom from 0.3.4 to 0.3.8 ( #13461 )
...
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-13 23:20:30 +09:00
dependabot-preview[bot]
e2fa1b2626
Bump cssom from 0.3.4 to 0.3.8 ( #13461 )
...
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-13 23:20:30 +09:00
dependabot-preview[bot]
9f535dd5d0
Bump regexp.prototype.flags from 1.2.0 to 1.3.0 ( #13468 )
...
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-13 23:18:01 +09:00
dependabot-preview[bot]
22d8d1e178
Bump regexp.prototype.flags from 1.2.0 to 1.3.0 ( #13468 )
...
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-13 23:18:01 +09:00
dependabot-preview[bot]
82d4934e21
Bump fabrication from 2.21.0 to 2.21.1 ( #13453 )
...
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-13 23:16:40 +09:00
dependabot-preview[bot]
d80a7366e4
Bump fabrication from 2.21.0 to 2.21.1 ( #13453 )
...
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-13 23:16:40 +09:00
dependabot-preview[bot]
abc78ebcea
Bump aws-sdk-s3 from 1.61.1 to 1.61.2 ( #13456 )
...
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-13 23:16:12 +09:00
dependabot-preview[bot]
16443975f5
Bump aws-sdk-s3 from 1.61.1 to 1.61.2 ( #13456 )
...
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-13 23:16:12 +09:00
dependabot-preview[bot]
9f43a52a80
Bump mousetrap from 1.6.2 to 1.6.5 ( #13466 )
...
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-13 23:14:37 +09:00
dependabot-preview[bot]
e357c771ac
Bump mousetrap from 1.6.2 to 1.6.5 ( #13466 )
...
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-13 23:14:37 +09:00
dependabot-preview[bot]
c734222726
Bump mkdirp from 1.0.3 to 1.0.4 ( #13463 )
...
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-13 23:11:52 +09:00