-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
Report the correct number of pushes on the feeds #16811
Report the correct number of pushes on the feeds #16811
Conversation
Since the number of commits in the Action table has been limited to 5 the number of commits reported on the feeds page is now incorrectly also limited to 5. The correct number is available as the Len and this PR changes this to report this. Fix go-gitea#16804 Signed-off-by: Andrew Thornton <art27@cantab.net>
This comment has been minimized.
This comment has been minimized.
Codecov Report
@@ Coverage Diff @@
## main #16811 +/- ##
=======================================
Coverage 45.46% 45.47%
=======================================
Files 762 762
Lines 86019 86027 +8
=======================================
+ Hits 39111 39122 +11
+ Misses 40593 40591 -2
+ Partials 6315 6314 -1
Continue to review full report at Codecov.
|
I could write a migration to "backfill" and attempt to recalculate I suppose we could actually make the Len field a string, so that for any actions that represent commits/pushes but don't contain a |
I don't think we should restrict the commit list in
Now the question is if both limits should be identical. Personally I think webhooks should get more data than the ui notification. [1] https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push |
We still need to use and create Len because we're not going to be able to rely on this not being truncated. |
* Report the correct number of pushes on the feeds Since the number of commits in the Action table has been limited to 5 the number of commits reported on the feeds page is now incorrectly also limited to 5. The correct number is available as the Len and this PR changes this to report this. Fix go-gitea#16804 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update templates/user/dashboard/feeds.tmpl Co-authored-by: techknowlogick <techknowlogick@gitea.io>
backported here: #16822 |
* Report the correct number of pushes on the feeds Since the number of commits in the Action table has been limited to 5 the number of commits reported on the feeds page is now incorrectly also limited to 5. The correct number is available as the Len and this PR changes this to report this. Fix #16804 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update templates/user/dashboard/feeds.tmpl Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net>
## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (go-gitea#16916) (go-gitea#16923) * Prevent leave changes dialogs due to autofill fields (go-gitea#16912) (go-gitea#16920) * Ignore review comment when ref commit is missed (go-gitea#16905) (go-gitea#16919) * Fix wrong attachment removal (go-gitea#16915) (go-gitea#16917) * Gitlab Migrator: dont ignore reactions of last request (go-gitea#16903) (go-gitea#16913) * Correctly return the number of Repositories for Organizations (go-gitea#16807) (go-gitea#16911) * Test if LFS object is accessible (go-gitea#16865) (go-gitea#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (go-gitea#16899) (go-gitea#16900) * Fix dump and restore respository (go-gitea#16698) (go-gitea#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (go-gitea#16894) (go-gitea#16895) * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16892) * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16888) * List limited and private orgs if authenticated on API (go-gitea#16866) (go-gitea#16879) * Simplify split diff view generation and remove JS dependency (go-gitea#16775) (go-gitea#16863) * Ensure that the default visibility is set on the user create page (go-gitea#16845) (go-gitea#16862) * In Render tolerate not being passed a context (go-gitea#16842) (go-gitea#16858) * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16848) * Report the correct number of pushes on the feeds (go-gitea#16811) (go-gitea#16822) * Add primary_key to issue_index (go-gitea#16813) (go-gitea#16820) * Prevent NPE on empty commit (go-gitea#16812) (go-gitea#16819) * Fix branch pagination error (go-gitea#16805) (go-gitea#16816) * Add missing return to handleSettingRemoteAddrError (go-gitea#16794) (go-gitea#16795) * Remove spurious / from issues.opened_by (go-gitea#16793) * Ensure that template compilation panics are sent to the logs (go-gitea#16788) (go-gitea#16792) * Update caddyserver/certmagic (go-gitea#16789) (go-gitea#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>
## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (#16916) (#16923) * Prevent leave changes dialogs due to autofill fields (#16912) (#16920) * Ignore review comment when ref commit is missed (#16905) (#16919) * Fix wrong attachment removal (#16915) (#16917) * Gitlab Migrator: dont ignore reactions of last request (#16903) (#16913) * Correctly return the number of Repositories for Organizations (#16807) (#16911) * Test if LFS object is accessible (#16865) (#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900) * Fix dump and restore respository (#16698) (#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) (#16895) * Fix wiki raw commit diff/patch view (#16891) (#16892) * Ensure wiki repos are all closed (#16886) (#16888) * List limited and private orgs if authenticated on API (#16866) (#16879) * Simplify split diff view generation and remove JS dependency (#16775) (#16863) * Ensure that the default visibility is set on the user create page (#16845) (#16862) * In Render tolerate not being passed a context (#16842) (#16858) * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848) * Report the correct number of pushes on the feeds (#16811) (#16822) * Add primary_key to issue_index (#16813) (#16820) * Prevent NPE on empty commit (#16812) (#16819) * Fix branch pagination error (#16805) (#16816) * Add missing return to handleSettingRemoteAddrError (#16794) (#16795) * Remove spurious / from issues.opened_by (#16793) * Ensure that template compilation panics are sent to the logs (#16788) (#16792) * Update caddyserver/certmagic (#16789) (#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>
## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (go-gitea#16916) (go-gitea#16923) * Prevent leave changes dialogs due to autofill fields (go-gitea#16912) (go-gitea#16920) * Ignore review comment when ref commit is missed (go-gitea#16905) (go-gitea#16919) * Fix wrong attachment removal (go-gitea#16915) (go-gitea#16917) * Gitlab Migrator: dont ignore reactions of last request (go-gitea#16903) (go-gitea#16913) * Correctly return the number of Repositories for Organizations (go-gitea#16807) (go-gitea#16911) * Test if LFS object is accessible (go-gitea#16865) (go-gitea#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (go-gitea#16899) (go-gitea#16900) * Fix dump and restore respository (go-gitea#16698) (go-gitea#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (go-gitea#16894) (go-gitea#16895) * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16892) * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16888) * List limited and private orgs if authenticated on API (go-gitea#16866) (go-gitea#16879) * Simplify split diff view generation and remove JS dependency (go-gitea#16775) (go-gitea#16863) * Ensure that the default visibility is set on the user create page (go-gitea#16845) (go-gitea#16862) * In Render tolerate not being passed a context (go-gitea#16842) (go-gitea#16858) * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16848) * Report the correct number of pushes on the feeds (go-gitea#16811) (go-gitea#16822) * Add primary_key to issue_index (go-gitea#16813) (go-gitea#16820) * Prevent NPE on empty commit (go-gitea#16812) (go-gitea#16819) * Fix branch pagination error (go-gitea#16805) (go-gitea#16816) * Add missing return to handleSettingRemoteAddrError (go-gitea#16794) (go-gitea#16795) * Remove spurious / from issues.opened_by (go-gitea#16793) * Ensure that template compilation panics are sent to the logs (go-gitea#16788) (go-gitea#16792) * Update caddyserver/certmagic (go-gitea#16789) (go-gitea#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>
## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (#16916) (#16923) * Prevent leave changes dialogs due to autofill fields (#16912) (#16920) * Ignore review comment when ref commit is missed (#16905) (#16919) * Fix wrong attachment removal (#16915) (#16917) * Gitlab Migrator: dont ignore reactions of last request (#16903) (#16913) * Correctly return the number of Repositories for Organizations (#16807) (#16911) * Test if LFS object is accessible (#16865) (#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900) * Fix dump and restore respository (#16698) (#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) (#16895) * Fix wiki raw commit diff/patch view (#16891) (#16892) * Ensure wiki repos are all closed (#16886) (#16888) * List limited and private orgs if authenticated on API (#16866) (#16879) * Simplify split diff view generation and remove JS dependency (#16775) (#16863) * Ensure that the default visibility is set on the user create page (#16845) (#16862) * In Render tolerate not being passed a context (#16842) (#16858) * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848) * Report the correct number of pushes on the feeds (#16811) (#16822) * Add primary_key to issue_index (#16813) (#16820) * Prevent NPE on empty commit (#16812) (#16819) * Fix branch pagination error (#16805) (#16816) * Add missing return to handleSettingRemoteAddrError (#16794) (#16795) * Remove spurious / from issues.opened_by (#16793) * Ensure that template compilation panics are sent to the logs (#16788) (#16792) * Update caddyserver/certmagic (#16789) (#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>
Unfortunately #16282 contained a regression whereby it was assumed that the []*Commits in PushCommits retained its full length and therefore the Len field was dropped.
This has led to the incorrect reporting of the number of commits in pushes which are larger than
setting.UI.FeedMaxCommitNum
.Prior to #16282 the Len was reported on the push commits so mostly we can just drop back to using this, and restart adding it back in.
However, for pushes after this - AFAICS this information is lost and is not recalcuable. Therefore these pushes will be limited to FeedMaxCommitNum.
Fix #16804
Signed-off-by: Andrew Thornton art27@cantab.net