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

Send dedicated error message to the create ticket dialogue if create permission permission is missing. (backport #1686) #1688

Merged
merged 3 commits into from
Sep 16, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2021

This is an automatic backport of pull request #1686 done by Mergify.
Cherry-pick of 08bf1a0 has failed:

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

You are currently cherry-picking commit 08bf1a0ae.
  (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/

If the create permission permission is missing when creating a
ticket, a new, dedicated error message is now sent to GSA.

In manage_sql_tickets.c in function create_ticket (..):
  A new error code is returned in case of a missing create
  permission permission.

In gmp_tickets.c in function create_ticket_run (..):
  A new error message is sent to GSA if the create permission
  permission is missing.

(cherry picked from commit f3c35a0)
(cherry picked from commit 08bf1a0)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner September 16, 2021 08:22
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Sep 16, 2021
@timopollmeier timopollmeier 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 Sep 16, 2021
@timopollmeier timopollmeier merged commit 36a01c2 into gvmd-21.04 Sep 16, 2021
@timopollmeier timopollmeier deleted the mergify/bp/gvmd-21.04/pr-1686 branch September 16, 2021 08:34
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