-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Show if a PR has conflicting files on the PR lists #10130
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Only one nit.
templates/repo/issue/list.tmpl
Outdated
{{end}} | ||
{{end}} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra line not required
It would be better to have this not in title but in line below before milestone with diff icon |
Codecov Report
@@ Coverage Diff @@
## master #10130 +/- ##
==========================================
- Coverage 43.4% 43.39% -0.02%
==========================================
Files 576 576
Lines 79623 79623
==========================================
- Hits 34560 34552 -8
- Misses 40785 40791 +6
- Partials 4278 4280 +2
Continue to review full report at Codecov.
|
I agree, I'll move it below |
4d7ebdd
to
88232d7
Compare
Please also update screenshot when done |
Out of scope for this PR, but we might need to consider adding some separators in that area soon. 😂 |
Haha, I was debating looking at adding some logic to pop in a |
Btw can you please send PR to add singular/plural to text (ex 1 conflicting file). You can check activity.tmpl for sample. There is method |
As hinted in #8659, this PR adds a simple message to PR lists if a PR has conflicting files. This is all achieved through tweaks to templates -
ConflictingFiles
array already exists on PR objects. I've chosen mirror as the octicon but I'm sure there's a better one!