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

Fix setting/displaying timeout in EditNvtDetailsDialog (backport #3057) #3080

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 23, 2021

This is an automatic backport of pull request #3057 done by Mergify.
Cherry-pick of ee2c739 has failed:

On branch mergify/bp/gsa-21.10/pr-3057
Your branch is ahead of 'origin/gsa-21.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ee2c73941.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

The timeout is no longer parsed as string from the xml, which makes this
function obsolete and removing it prevents crashes due to the call of
String.prototype.trim()

(cherry picked from commit 55cd4c6)
(cherry picked from commit ee2c739)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 23, 2021 06:16
@mergify mergify bot added the conflicts label Jul 23, 2021
@bjoernricks
Copy link
Contributor

21.10 branch got replaced by master.

@bjoernricks bjoernricks deleted the mergify/bp/gsa-21.10/pr-3057 branch July 23, 2021 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants