mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-20 16:10:50 +00:00
Show if commit is signed in activity feed and unify sha box (#6933)
Some checks are pending
/ release (push) Waiting to run
testing / backend-checks (push) Has been skipped
testing / frontend-checks (push) Has been skipped
testing / test-unit (push) Has been skipped
testing / test-e2e (push) Has been skipped
testing / test-mysql (push) Has been skipped
testing / test-pgsql (push) Has been skipped
testing / test-sqlite (push) Has been skipped
testing / test-remote-cacher (redis) (push) Has been skipped
testing / test-remote-cacher (valkey) (push) Has been skipped
testing / test-remote-cacher (garnet) (push) Has been skipped
testing / test-remote-cacher (redict) (push) Has been skipped
testing / security-check (push) Has been skipped
Some checks are pending
/ release (push) Waiting to run
testing / backend-checks (push) Has been skipped
testing / frontend-checks (push) Has been skipped
testing / test-unit (push) Has been skipped
testing / test-e2e (push) Has been skipped
testing / test-mysql (push) Has been skipped
testing / test-pgsql (push) Has been skipped
testing / test-sqlite (push) Has been skipped
testing / test-remote-cacher (redis) (push) Has been skipped
testing / test-remote-cacher (valkey) (push) Has been skipped
testing / test-remote-cacher (garnet) (push) Has been skipped
testing / test-remote-cacher (redict) (push) Has been skipped
testing / security-check (push) Has been skipped
Old activities are shown like before, new commits are displayed like commits in e.g. the commits list. _(Second commit)_ | New signed commits | Old (signed) commits | |:--:|:--:| |  |  | Additionally the sha box was moved in an own component to unify the usage. _(First commit)_ Closes #1824 <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - User Interface features - [PR](https://codeberg.org/forgejo/forgejo/pulls/6933): <!--number 6933 --><!--line 0 --><!--description U2hvdyBpZiBjb21taXQgaXMgdmVyaWZpZWQgaW4gYWN0aXZpdHkgZmVlZCBvZiBhbiB1c2VyIG9yIGFuIG9yZ2FuaXphdGlvbiBmb3IgbmV3IGFjdGl2aXR5-->Show if commit is verified in activity feed of an user or an organization for new activity<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6933 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Beowulf <beowulf@beocode.eu> Co-committed-by: Beowulf <beowulf@beocode.eu>
This commit is contained in:
parent
82477cb55c
commit
37d566bdb0
22 changed files with 344 additions and 89 deletions
|
@ -1,4 +1,5 @@
|
|||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package repository
|
||||
|
@ -133,6 +134,50 @@ func TestPushCommits_AvatarLink(t *testing.T) {
|
|||
pushCommits.AvatarLink(db.DefaultContext, "nonexistent@example.com"))
|
||||
}
|
||||
|
||||
func TestPushCommitToCommit(t *testing.T) {
|
||||
now := time.Now()
|
||||
sig := &git.Signature{
|
||||
Email: "example@example.com",
|
||||
Name: "John Doe",
|
||||
When: now,
|
||||
}
|
||||
const hexString = "0123456789abcdef0123456789abcdef01234567"
|
||||
sha1, err := git.NewIDFromString(hexString)
|
||||
require.NoError(t, err)
|
||||
commit, err := PushCommitToCommit(&PushCommit{
|
||||
Sha1: sha1.String(),
|
||||
Message: "Commit Message",
|
||||
AuthorEmail: "example@example.com",
|
||||
AuthorName: "John Doe",
|
||||
CommitterEmail: "example@example.com",
|
||||
CommitterName: "John Doe",
|
||||
Signature: nil,
|
||||
Timestamp: now,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, sha1, commit.ID)
|
||||
assert.Equal(t, "Commit Message", commit.CommitMessage)
|
||||
assert.Equal(t, sig, commit.Author)
|
||||
assert.Equal(t, sig, commit.Committer)
|
||||
assert.Nil(t, commit.Signature)
|
||||
}
|
||||
|
||||
func TestPushCommitToCommitInvalidSha(t *testing.T) {
|
||||
now := time.Now()
|
||||
const hexString = "012"
|
||||
_, err := PushCommitToCommit(&PushCommit{
|
||||
Sha1: hexString,
|
||||
Message: "Commit Message",
|
||||
AuthorEmail: "example@example.com",
|
||||
AuthorName: "John Doe",
|
||||
CommitterEmail: "example@example.com",
|
||||
CommitterName: "John Doe",
|
||||
Signature: nil,
|
||||
Timestamp: now,
|
||||
})
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
func TestCommitToPushCommit(t *testing.T) {
|
||||
now := time.Now()
|
||||
sig := &git.Signature{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue