Skip to content

Show outdated comments in pull request #13148

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
Oct 15, 2020
Merged

Show outdated comments in pull request #13148

merged 2 commits into from
Oct 15, 2020

Conversation

ivanvc
Copy link
Contributor

@ivanvc ivanvc commented Oct 15, 2020

This PR addresses issue #12523. Outdated comments are expanded by default and added an "Outdated" label to them. Resolved comments are collapsed by default. This is how it initially looks when loading the pull request:

Screenshot from 2020-10-14 17-34-04

  • The first comment was marked as resolved.
  • The second comment is outdated as that line was changed in a commit.
  • The last comment is neither resolved nor outdated.

Fixes #12523.

@codecov-io
Copy link

Codecov Report

Merging #13148 into master will increase coverage by 0.10%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13148      +/-   ##
==========================================
+ Coverage   41.97%   42.08%   +0.10%     
==========================================
  Files         681      681              
  Lines       75121    75121              
==========================================
+ Hits        31535    31611      +76     
+ Misses      38456    38359      -97     
- Partials     5130     5151      +21
Impacted Files Coverage Δ
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/log/event.go 59.90% <0.00%> (-1.89%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
services/pull/check.go 49.63% <0.00%> (-1.46%) ⬇️
models/error.go 34.39% <0.00%> (ø)
services/pull/pull.go 41.27% <0.00%> (+0.49%) ⬆️
modules/git/repo.go 47.71% <0.00%> (+1.01%) ⬆️
services/mailer/mail.go 55.91% <0.00%> (+1.07%) ⬆️
modules/notification/notification.go 81.25% <0.00%> (+2.67%) ⬆️
modules/notification/base/null.go 71.42% <0.00%> (+2.85%) ⬆️
... and 6 more

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 e4a3785...6d5e846. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 15, 2020
@lafriks lafriks added the type/enhancement An improvement of existing functionality label Oct 15, 2020
@lafriks lafriks added this to the 1.14.0 milestone Oct 15, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 15, 2020
@zeripath
Copy link
Contributor

IMO could be backported to 1.13 as it's been a long-term gripe for users.

@lafriks lafriks merged commit 05c7e58 into go-gitea:master Oct 15, 2020
@lafriks
Copy link
Member

lafriks commented Oct 15, 2020

what the hell... I did press update branch but it somehow got merged :/

@lafriks
Copy link
Member

lafriks commented Oct 15, 2020 •
edited
Loading

please send backport to release/v1.13 branch

@ivanvc
Copy link
Contributor Author

ivanvc commented Oct 15, 2020 •
edited
Loading

@lafriks I'll start a new PR as I can't re-open this one. However, I was thinking if I should refactor, or create a generic "tag" css class as the same style is used in at least three places. I didn't do it before, because couldn't find a place in the css where the style for the basic elements is defined.

Thoughts? Or should I just keep it as is?

6543 pushed a commit to 6543-forks/gitea that referenced this pull request Oct 15, 2020
@ivanvc @zeripath @6543
Show outdated comments in pull request (go-gitea#13148)
c6b8a5c 
Co-authored-by: zeripath <art27@cantab.net>
@6543 6543 mentioned this pull request Oct 15, 2020
Merged
@6543
Copy link
Member

6543 commented Oct 15, 2020 •
edited
Loading

@ivanvc I'll have done the backport for you :)

git fetch --all
git checkout -f upstream/release/v1.13 -b backport_show-outdated-comments-in-pull-request_131
git cherry-pick -S 05c7e58
git push -u own backport_show-outdated-comments-in-pull-request_13148

-> #13162

"... I can't re-open ..."

@ivanvc pleace do a new pull for each task/issue - and yes refactors are welcome too :)

@6543 6543 added the backport/done All backports for this PR have been created label Oct 15, 2020
@ivanvc
Copy link
Contributor Author

ivanvc commented Oct 15, 2020

@6543 Cool, thanks. I'll refactor later the CSS to make it more standard and open a PR against master, as I guess it is just an improvement.

techknowlogick pushed a commit that referenced this pull request Oct 16, 2020
@6543 @ivanvc @zeripath
Show outdated comments in pull request (#13148) (#13162)
2ec50b9 
Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Iván Valdés <iv@a.ki>
Co-authored-by: zeripath <art27@cantab.net>
@ivanvc ivanvc mentioned this pull request Oct 16, 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

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Show outdated comments in pull request
6 participants
@ivanvc @codecov-io @zeripath @lafriks @6543 @GiteaBot