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

Set result UUID in note dialog (backport #2889) #2890

Merged
merged 4 commits into from
Apr 30, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 30, 2021

This is an automatic backport of pull request #2889 done by Mergify.
Cherry-pick of 5ab684b has failed:

On branch mergify/bp/master/pr-2889
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 5ab684b5cc.
  (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:   gsa/src/web/pages/notes/dialog.js

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

Cherry-pick of 79a083c has failed:

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

You are currently cherry-picking commit 79a083c3e5.
  (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://help.github.com/articles/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/

(cherry picked from commit 5ab684b)

# Conflicts:
#	gsa/src/web/pages/notes/dialog.js
(cherry picked from commit 79a083c)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner April 30, 2021 10:28
@mergify mergify bot added the conflicts label Apr 30, 2021
@codecov
Copy link

codecov bot commented Apr 30, 2021

Codecov Report

Merging #2890 (93ad539) into master (4e2417f) will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2890      +/-   ##
==========================================
- Coverage   64.78%   64.78%   -0.01%     
==========================================
  Files        1120     1120              
  Lines       29152    29152              
  Branches     8251     8251              
==========================================
- Hits        18887    18885       -2     
- Misses       9286     9288       +2     
  Partials      979      979              
Impacted Files Coverage Δ
gsa/src/web/pages/notes/dialog.js 4.87% <ø> (ø)
gsa/src/web/components/menu/usermenu.js 77.77% <0.00%> (-7.41%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4e2417f...93ad539. Read the comment docs.

@swaterkamp swaterkamp merged commit 222c8b4 into master Apr 30, 2021
@swaterkamp swaterkamp deleted the mergify/bp/master/pr-2889 branch April 30, 2021 11:10
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.

1 participant