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

Properly space and linebreak roles and groups in users table row (backport #2949) #2998

Merged
merged 5 commits into from
Jun 15, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 15, 2021

This is an automatic backport of pull request #2949 done by Mergify.
Cherry-pick of 7a5466a has failed:

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

You are currently cherry-picking commit 7a5466ac4.
  (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 6bf8ea8)
(cherry picked from commit e0e7d18)
(cherry picked from commit 7a5466a)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 15, 2021 07:20
@mergify mergify bot added the conflicts label Jun 15, 2021
@swaterkamp swaterkamp enabled auto-merge June 15, 2021 07:27
@codecov
Copy link

codecov bot commented Jun 15, 2021

Codecov Report

Merging #2998 (79825c5) into gsa-21.10 (7b844ad) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head 79825c5 differs from pull request most recent head 2760f2e. Consider uploading reports for the commit 2760f2e to get more accurate results
Impacted file tree graph

@@              Coverage Diff              @@
##           gsa-21.10    #2998      +/-   ##
=============================================
- Coverage      54.26%   54.25%   -0.01%     
=============================================
  Files           1060     1060              
  Lines          25998    25999       +1     
  Branches        7455     7456       +1     
=============================================
- Hits           14109    14107       -2     
- Misses         10778    10781       +3     
  Partials        1111     1111              
Impacted Files Coverage Δ
gsa/src/web/pages/users/row.js 26.66% <ø> (ø)
gsa/src/web/components/layout/horizontalsep.js 100.00% <100.00%> (ø)
gsa/src/web/entities/container.js 44.48% <0.00%> (-1.23%) ⬇️

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 7b844ad...2760f2e. Read the comment docs.

@swaterkamp swaterkamp merged commit 79e30f6 into gsa-21.10 Jun 15, 2021
@swaterkamp swaterkamp deleted the mergify/bp/gsa-21.10/pr-2949 branch June 15, 2021 07:29
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