Fixes #22205 - restore blueprint actions for notifications #5159
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
|
Issues: #22205 |
|
@ares please rebase on latest develop to fix failing minitest issue |
|
thanks @tbrisker, rebased |
|
another rebase for the audited pin is needed now... |
|
Does this also need the 1.17 milestone? |
|
it's set in redmine, but I assigned the milestone too, I'll rebase soon |
|
rebased |
ekohl
reviewed
Jan 11, 2018
| subject, | ||
| notification_blueprint.actions | ||
| ).actions if notification_blueprint.actions.any? | ||
| ).actions if notification_blueprint.actions.any? && self.actions.blank? |
There was a problem hiding this comment.
Not a ruby developer, but multi line statements with guards are hard to parse for me.
There was a problem hiding this comment.
I'm not making the problem worse, since this will be cherrypicked I'd probably keep it as it is, I can open separate PR with refactoring if you prefer
tbrisker
approved these changes
Jan 16, 2018
|
Cherry-picked to 1.17-stable as well as d11899e |
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.
self.actions defaults to
{}, the logic with conditional overiding is correct but the condition is wrong