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

Make the list of banned users configurable Draft pull #137

Merged
merged 2 commits into from
Dec 9, 2024

Conversation

jeffiscow2
Copy link
Contributor

No description provided.

Copy link
Member

@abompard abompard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, please also add the list to the fedbadges.toml.example file.

devel/ansible/roles/dev/files/config.toml Outdated Show resolved Hide resolved
fedbadges/rules.py Outdated Show resolved Hide resolved
@abompard
Copy link
Member

abompard commented Nov 8, 2024

Also, please squash your commits.

@jeffiscow2 jeffiscow2 marked this pull request as ready for review November 11, 2024 12:07
@jeffiscow2
Copy link
Contributor Author

I Cant get the commits to squash and I've tried a million things. I pretty shure I made it worse... lol

@jeffiscow2 jeffiscow2 marked this pull request as draft November 11, 2024 12:14
@jeffiscow2 jeffiscow2 requested a review from abompard November 11, 2024 12:15
@abompard
Copy link
Member

OK I think I fixed the squashes :-)

fedbadges/rules.py Outdated Show resolved Hide resolved
fedbadges.toml.example Show resolved Hide resolved
@jeffiscow2 jeffiscow2 marked this pull request as ready for review December 6, 2024 01:07
Copy link
Contributor Author

@jeffiscow2 jeffiscow2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I turned rules reload back to 15 from 1

fedbadges.toml.example Show resolved Hide resolved
@@ -0,0 +1,3 @@
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is unrelated to this PR, please don't add it.


# Users skipped when awarding badges
skip_users = [
# Users skped when awarding badges
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo here.


# Remove None

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't really need to add this empty line, comments are usually right above what they are commenting.

@abompard
Copy link
Member

abompard commented Dec 9, 2024

Looks like you've merged your local copy into the changed that I had made to this pull request, which added back all the commits including merge conflicts.
I'm going to push my changes again. Then you can do git reset --hard origin/develop and it'll bring your local copy in line with the PR. I'll incorporate the changes you did in ff8787f.

@abompard abompard force-pushed the develop branch 2 times, most recently from 0a7f114 to 87dac8d Compare December 9, 2024 08:27
@abompard
Copy link
Member

abompard commented Dec 9, 2024

The problem may be coming from the fact that the Git integration in VS Code is really basic and doesn't let you do advanced stuff without an additional plugin. In any case, please remember to check the "Files changed" section of a PR after you've pushed, to make sure the changes are exactly what you want in the PR and nothing else.

@abompard abompard merged commit 1297e9a into fedora-infra:develop Dec 9, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants