Skip to content

Show if a PR has conflicting files on the PR lists #10130

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 3, 2020
Merged

Show if a PR has conflicting files on the PR lists #10130

merged 2 commits into from
Feb 3, 2020

Conversation

jamesorlakin
Copy link
Contributor

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!

image

guillep2k
guillep2k approved these changes Feb 3, 2020
View reviewed changes
Copy link
Member

@guillep2k guillep2k left a 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}}


Copy link
Member

Choose a reason for hiding this comment

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

Extra line not required

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 3, 2020
@guillep2k guillep2k mentioned this pull request Feb 3, 2020
Open
17 tasks
@lafriks
Copy link
Member

lafriks commented Feb 3, 2020

It would be better to have this not in title but in line below before milestone with diff icon

@codecov-io
Copy link

codecov-io commented Feb 3, 2020 •
edited
Loading

Codecov Report

Merging #10130 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
modules/templates/helper.go 40.36% <ø> (ø) ⬆️
modules/base/tool.go 62.94% <100%> (ø) ⬆️
modules/process/manager.go 74.69% <0%> (-3.62%) ⬇️
modules/queue/unique_queue_disk_channel.go 52.56% <0%> (-1.93%) ⬇️
modules/log/event.go 64.61% <0%> (-1.03%) ⬇️

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 88232d7...67e98c4. Read the comment docs.

@jamesorlakin
Copy link
Contributor Author

I agree, I'll move it below

@jamesorlakin jamesorlakin force-pushed the PRConflictingFilesList branch from 4d7ebdd to 88232d7 Compare February 3, 2020 19:51
@lafriks
Copy link
Member

lafriks commented Feb 3, 2020

Please also update screenshot when done

@jamesorlakin
Copy link
Contributor Author

The tweaks now look like this:
image

It should always appear at the end.

@jolheiser
Copy link
Member

Out of scope for this PR, but we might need to consider adding some separators in that area soon. 😂

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 3, 2020
@jamesorlakin
Copy link
Contributor Author

Haha, I was debating looking at adding some logic to pop in a | symbol or something!

@lafriks lafriks added topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality labels Feb 3, 2020
@lafriks lafriks added this to the 1.12.0 milestone Feb 3, 2020
@lafriks lafriks merged commit 3ff95ce into go-gitea:master Feb 3, 2020
@lafriks
Copy link
Member

lafriks commented Feb 3, 2020

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 TrN to do that

@jamesorlakin jamesorlakin mentioned this pull request Feb 7, 2020
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@jolheiser jolheiser jolheiser approved these changes

+1 more reviewer

@guillep2k guillep2k guillep2k approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.
6 participants
@jamesorlakin @lafriks @codecov-io @jolheiser @guillep2k @GiteaBot