Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

agent: fix request merging when comment is missing #767

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

dpausp
Copy link
Member

@dpausp dpausp commented Aug 11, 2023

Don't fail merging when the first request doesn't have an explicity set comment. Also put newlines between merged comments.

PL-131698

@flyingcircusio/release-managers

Release process

Impact:

Changelog:

  • (not relevant)

Security implications

  • Security requirements defined? (WHERE)
    • nothing new, just a fix for manually-created maintenance requests.
  • Security requirements tested? (EVIDENCE)
    • checked merging on test system, Python tests cover merging requests now

Copy link
Member

@osnyx osnyx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I heard that tests are pending as well, so LGTM

@dpausp dpausp force-pushed the PL-131698-agent-fix-request-merge branch 2 times, most recently from 6fff718 to a121850 Compare August 11, 2023 11:44
Don't fail merging when the first request doesn't have an explicity
set comment or estimate. Also put newlines between merged comments
and use the other estimate if the original request had no explicit
estimate set.

PL-131698
@dpausp dpausp force-pushed the PL-131698-agent-fix-request-merge branch from a121850 to 27809b8 Compare August 11, 2023 11:47
@dpausp dpausp marked this pull request as ready for review August 11, 2023 11:49
@dpausp
Copy link
Member Author

dpausp commented Aug 11, 2023

I pushed a change after the approval but it's just the same behaviour as for comments applied to estimates. Also added tests which cover the changes.

@dpausp dpausp merged commit 497e870 into fc-23.05-dev Aug 11, 2023
1 check passed
@dpausp dpausp deleted the PL-131698-agent-fix-request-merge branch August 11, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants