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

Add --optimize add-/cleanup-feed-permissions (backport #1612) #1646

Merged
merged 4 commits into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This is an automatic backport of pull request #1612 done by Mergify.
Cherry-pick of 1e410f5 has failed:

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

You are currently cherry-picking commit 1e410f56e.
  (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 add-feed-permissions option adds read permissions on the feed data
objects for all roles defined in the "Feed Import Roles" setting if they
do not exist.
The cleanup-feed-permissions removes all role permissions on the feed
data objects that do not match ones in the setting.

(cherry picked from commit 9e97c38)
(cherry picked from commit 1e410f5)

# Conflicts:
#	CHANGELOG.md
If there are error responses from the create_permission_internal calls,
they will now be handled by logging appropriate warning messages.

(cherry picked from commit adb51f6)
@mergify mergify bot requested a review from a team as a code owner July 28, 2021 10:57
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jul 28, 2021
@jhelmold jhelmold added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Jul 28, 2021
@timopollmeier timopollmeier merged commit 4a53d95 into gvmd-20.08 Jul 28, 2021
@timopollmeier timopollmeier deleted the mergify/bp/gvmd-20.08/pr-1612 branch July 28, 2021 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants