[pull] dev from opf:dev #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
- https://community.openproject.org/work_packages/57709 - use authentication strategy pattern
We want `MailerJob` to behave like both our `ApplicationJob` (for reloading the mailer configuration and resetting the request store automatically) and `ActionMailer::MailDeliveryJob` (for the basic functionalities of sending emails). As we can only inherit from one of these two classes, we inherit from `ApplicationJob` and copy the relevant parts from `ActionMailer::MailDeliveryJob`. This copy was done some time ago, and the `ActionMailer::MailDeliveryJob` class has evolved since then. This commit updates our copy to match the current `ActionMailer::MailDeliveryJob` class.
https://community.openproject.org/wp/57932 Retrying 14 times with polynomial backoff means it will retry for roughly 1.5 days. Previously the `retry_on StandardError` defined in the `Mails::MailerJob` class was ignored because there is also a `rescue_from StandardError` declared after it. As `retry_on` is implemented using `rescue_from`, and the handlers are evaluated in reverse order, the last declared `rescue_from` would be picked up and the retry logic would not be triggered. That's why mail jobs were discarded instead of being retried. This commit fixes the issue by inheriting directly from `ActionMailer::MailDeliveryJob` instead of redefining its methods. This was the `rescue_from` is declared first in the parent class, and then `retry_on` is declared second in the child class, meaning it will take precedence and be picked up. The needed shared logic from `ApplicationJob` is extracted to a new `SharedJobSetup` module and included in both `ApplicationJob` and `Mails::MailerJob`.
…d_user_to_group_command
…failed-emails [57932] Make `Mails::MailerJob` retry failed emails
Bumps [sys-filesystem](https://github.com/djberg96/sys-filesystem) from 1.5.0 to 1.5.3. - [Changelog](https://github.com/djberg96/sys-filesystem/blob/main/CHANGES.md) - [Commits](djberg96/sys-filesystem@sys-filesystem-1.5.0...sys-filesystem-1.5.3) --- updated-dependencies: - dependency-name: sys-filesystem dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.9 to 4.17.10. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash) --- updated-dependencies: - dependency-name: "@types/lodash" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.45 to 0.5.46. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](moment/moment-timezone@0.5.45...0.5.46) --- updated-dependencies: - dependency-name: moment-timezone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.0.5 to 3.1.0. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop-rspec@v3.0.5...v3.1.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
- add contributors - ad link to blog article (will be published tomorrow)
Removes note about stopping associated builds - this is not possible for forks. [ci skip]
…ation-in-add_user_to_group_command [#57709] rework add user command
Remove deprecated toast methods
…tem-1.5.3 Bump sys-filesystem from 1.5.0 to 1.5.3
Improvements to CONTRIBUTING.md
* Mark the hours as html_safe so that they are shown correctly * Remove unused functionas and classes * Remove unused style definitions --------- Co-authored-by: Oliver Günther <mail@oliverguenther.de>
* Mark the hours as html_safe so that they are shown correctly * Remove unused functionas and classes * Remove unused style definitions --------- Co-authored-by: Oliver Günther <mail@oliverguenther.de>
Change the grid for #main as soon as the sidebar collapses
…ev/types/lodash-4.17.10 Bump @types/lodash from 4.17.9 to 4.17.10 in /frontend
…ev/eslint-plugin-import-2.31.0 Bump eslint-plugin-import from 2.30.0 to 2.31.0 in /frontend
- enable eager loading of representer classes in custom fields injector
expect_flash should be used now
…ev/moment-timezone-0.5.46 Bump moment-timezone from 0.5.45 to 0.5.46 in /frontend
…ter-in-dynamic-injector [chore] add dummy hierarchy item representer class
Fix/bump gems
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )