Skip to content

Group Label Changed Comments in timeline#13304

Merged
techknowlogick merged 7 commits into
go-gitea:masterfrom
pta2002:master
Oct 25, 2020
Merged

Group Label Changed Comments in timeline#13304
techknowlogick merged 7 commits into
go-gitea:masterfrom
pta2002:master

Conversation

@pta2002
Copy link
Copy Markdown
Contributor

@pta2002 pta2002 commented Oct 25, 2020

This targets issue #13268, by grouping label changed comments in an issue's timeline, similar to how GitHub does it. Here's an example:

image

@pta2002
Copy link
Copy Markdown
Contributor Author

pta2002 commented Oct 25, 2020

image

Took the chance to group removing and adding as well!

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 25, 2020
@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 25, 2020 •
edited
Loading

Codecov Report

Merging #13304 into master will increase coverage by 0.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #13304   +/-   ##
=======================================
  Coverage   42.13%   42.14%           
=======================================
  Files         689      689           
  Lines       75764    75810   +46     
=======================================
+ Hits        31926    31948   +22     
- Misses      38611    38629   +18     
- Partials     5227     5233    +6
Impacted Files Coverage Δ
models/issue_comment.go 52.21% <ø> (ø)
routers/repo/issue.go 37.53% <60.60%> (+0.48%) ⬆️
modules/templates/helper.go 47.89% <100.00%> (+0.63%) ⬆️
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/indexer/stats/db.go 52.17% <0.00%> (-8.70%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/git/repo.go 46.19% <0.00%> (-0.51%) ⬇️
models/oauth2.go 33.33% <0.00%> (ø)
modules/auth/oauth2/oauth2.go 27.63% <0.00%> (+0.04%) ⬆️
models/unit.go 49.31% <0.00%> (+2.73%) ⬆️

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 f565cf5...871ff39. Read the comment docs.

zeripath
zeripath reviewed Oct 25, 2020
View reviewed changes
Comment thread templates/repo/issue/view_content/comments.tmpl
@pta2002 @zeripath
Fix indentation on comments.tmpl
871ff39 
Co-authored-by: zeripath <art27@cantab.net>
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 25, 2020
@6543 6543 added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Oct 25, 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 1 This PR needs approval from one additional maintainer to be merged. labels Oct 25, 2020
@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented Oct 25, 2020

@pta2002 please update your branch.

(In general it is a better and easier if you allow maintainers to update the branch.)

@pta2002
Copy link
Copy Markdown
Contributor Author

pta2002 commented Oct 25, 2020 •
edited
Loading

Done, how'd I allow maintainers to update the branch in the future?

@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented Oct 25, 2020

Unfortunately it needs another update

@techknowlogick
Copy link
Copy Markdown
Member

techknowlogick commented Oct 25, 2020

🚀

@techknowlogick techknowlogick merged commit c40df54 into go-gitea:master Oct 25, 2020
@lafriks lafriks added this to the 1.14.0 milestone Oct 26, 2020
@lunny lunny mentioned this pull request Oct 26, 2020
Closed
ivanvc added a commit to ivanvc/gitea that referenced this pull request Oct 27, 2020
@ivanvc
Merge remote-tracking branch 'origin/master' into ensure-user-email-i…
e259244 
…s-stored-in-email-address-table

* origin/master:
  [UI] Hide consecutive additions and removals of the same label (go-gitea#13315)
  [skip ci] Updated translations via Crowdin
  Fix send mail (go-gitea#13312)
  [skip ci] Updated translations via Crowdin
  Deny wrong pull (go-gitea#13308)
  Group Label Changed Comments in timeline (go-gitea#13304)
  [skip ci] Updated translations via Crowdin
  Attempt to handle unready PR in tests (go-gitea#13305)
  go-gitea#12897 - add mastodon provider (go-gitea#13293)
  [skip ci] Updated translations via Crowdin
  Fix Storage mapping (go-gitea#13297)
  Update Mirror IsEmpty status on synchronize (go-gitea#13185)
  Fix bug isEnd detection on getIssues/getPullRequests (go-gitea#13299)
  systemd service: Add commented PATH environment option for Git prefix (go-gitea#13170)
  Sendmail command (go-gitea#13079)
  Various UI and arc-green fixes (go-gitea#13291)
@6543 6543 mentioned this pull request Oct 31, 2020
Closed
@a1012112796 a1012112796 mentioned this pull request Nov 1, 2020
Closed
7 tasks
@lunny lunny mentioned this pull request Nov 16, 2020
Closed
@noerw noerw mentioned this pull request Dec 9, 2020
Closed
6 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@6543 6543 6543 approved these changes

+2 more reviewers

@mrsdizzie mrsdizzie mrsdizzie approved these changes

@zeripath zeripath zeripath 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.14.0

Development

Successfully merging this pull request may close these issues.

8 participants

@pta2002 @codecov-io @zeripath @techknowlogick @mrsdizzie @6543 @lafriks @GiteaBot