-
-
Notifications
You must be signed in to change notification settings - Fork 467
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
Permissions v2 - Redo for merge conflicts #1328
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into permissions-v2
Implement application command permissions v2
# Conflicts: # discord/bot.py # discord/commands/core.py
Co-authored-by: Jay Turner <jaynicholasturner@gmail.com>
krittick
added
priority: high
High Priority
status: in progress
Work in Progess
Merge with squash
labels
May 5, 2022
# Conflicts: # discord/commands/core.py
Codecov Report
@@ Coverage Diff @@
## master #1328 +/- ##
==========================================
+ Coverage 33.42% 33.51% +0.08%
==========================================
Files 93 93
Lines 17621 17563 -58
==========================================
- Hits 5890 5886 -4
+ Misses 11731 11677 -54
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
krittick
added
bypass-review
Bypasses reviews for urgent pull requests involving critical code or documentation fixes.
feature
Implements a feature
and removed
status: in progress
Work in Progess
labels
May 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bypass-review
Bypasses reviews for urgent pull requests involving critical code or documentation fixes.
feature
Implements a feature
priority: high
High Priority
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This is a copy of #1183 to re-do the merge conflict resolution after it was previously broken
Checklist
type: ignore
comments were used, a comment is also left explaining why