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

[8.5] Updates warning about editing rules using API authentication (backport #4110) #4156

Merged
merged 3 commits into from
Nov 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2023

This is an automatic backport of pull request #4110 done by Mergify.
Cherry-pick of 783ce5a has failed:

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

You are currently cherry-picking commit 783ce5ab.
  (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)

Changes to be committed:
	modified:   docs/detections/api/rules/rules-api-bulk-actions.asciidoc
	modified:   docs/detections/api/rules/rules-api-import.asciidoc
	modified:   docs/detections/api/rules/rules-api-overview.asciidoc
	modified:   docs/detections/api/rules/rules-api-update.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/detections/api/rules/rules-api-create.asciidoc

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.com

* Updates warning about editing rules using API authentication

* Apply suggestions from TW review

Co-authored-by: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com>

* Applies TW feedback

* Updates notes to address both scenarios

* Removes extra period

---------

Co-authored-by: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com>
(cherry picked from commit 783ce5a)

# Conflicts:
#	docs/detections/api/rules/rules-api-create.asciidoc
Copy link

github-actions bot commented Nov 1, 2023

Documentation previews:

@natasha-moore-elastic natasha-moore-elastic merged commit 6b86f7c into 8.5 Nov 1, 2023
1 check passed
@mergify mergify bot deleted the mergify/bp/8.5/pr-4110 branch November 1, 2023 19:16
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