mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-21 05:55:28 +01:00
daf2a4c047
There's a bug in #25715: If user pushed a commit into another repo with same branch name, the no-related repo will display the recently pushed notification incorrectly. It is simple to fix this, we should match the repo id in the sql query. ![image](https://github.com/go-gitea/gitea/assets/18380374/9411a926-16f1-419e-a1b5-e953af38bab1) The latest commit is 2 weeks ago. ![image](https://github.com/go-gitea/gitea/assets/18380374/52f9ab22-4999-43ac-a86f-6d36fb1e0411) The notification comes from another repo with same branch name: ![image](https://github.com/go-gitea/gitea/assets/18380374/a26bc335-8e5b-4b9c-a965-c3dc3fa6f252) After: In forked repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/ce6ffc35-deb7-4be7-8b09-184207392f32) New PR Link will redirect to the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/7b98e76f-0c75-494c-9462-80cf9f98e786) In the original repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/5f6a821b-e51a-4bbd-9980-d9eb94a3c847) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/1ce8c879-9f11-4312-8c32-695d7d9af0df) In the same repo: ![image](https://github.com/go-gitea/gitea/assets/18380374/64b56073-4d0e-40c4-b8a0-80be7a775f69) New PR Link: ![image](https://github.com/go-gitea/gitea/assets/18380374/96e1b6a3-fb98-40ee-b2ee-648039fb0dcf) 08/15 Update: Follow #26257, added permission check and logic fix mentioned in https://github.com/go-gitea/gitea/pull/26257#discussion_r1294085203 2024/04/25 Update: Fix #30611 --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
84 lines
1.6 KiB
YAML
84 lines
1.6 KiB
YAML
-
|
|
id: 1
|
|
repo_id: 1
|
|
name: 'foo'
|
|
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
|
|
commit_message: 'first commit'
|
|
commit_time: 978307100
|
|
pusher_id: 1
|
|
is_deleted: true
|
|
deleted_by_id: 1
|
|
deleted_unix: 978307200
|
|
|
|
-
|
|
id: 2
|
|
repo_id: 1
|
|
name: 'bar'
|
|
commit_id: '62fb502a7172d4453f0322a2cc85bddffa57f07a'
|
|
commit_message: 'second commit'
|
|
commit_time: 978307100
|
|
pusher_id: 1
|
|
is_deleted: true
|
|
deleted_by_id: 99
|
|
deleted_unix: 978307200
|
|
|
|
-
|
|
id: 3
|
|
repo_id: 1
|
|
name: 'branch2'
|
|
commit_id: '985f0301dba5e7b34be866819cd15ad3d8f508ee'
|
|
commit_message: 'make pull5 outdated'
|
|
commit_time: 1579166279
|
|
pusher_id: 1
|
|
is_deleted: false
|
|
deleted_by_id: 0
|
|
deleted_unix: 0
|
|
|
|
-
|
|
id: 4
|
|
repo_id: 1
|
|
name: 'master'
|
|
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
|
|
commit_message: 'Initial commit'
|
|
commit_time: 1489927679
|
|
pusher_id: 1
|
|
is_deleted: false
|
|
deleted_by_id: 0
|
|
deleted_unix: 0
|
|
|
|
-
|
|
id: 5
|
|
repo_id: 10
|
|
name: 'master'
|
|
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
|
|
commit_message: 'Initial commit'
|
|
commit_time: 1489927679
|
|
pusher_id: 12
|
|
is_deleted: false
|
|
deleted_by_id: 0
|
|
deleted_unix: 0
|
|
|
|
-
|
|
id: 6
|
|
repo_id: 10
|
|
name: 'outdated-new-branch'
|
|
commit_id: 'cb24c347e328d83c1e0c3c908a6b2c0a2fcb8a3d'
|
|
commit_message: 'add'
|
|
commit_time: 1489927679
|
|
pusher_id: 12
|
|
is_deleted: false
|
|
deleted_by_id: 0
|
|
deleted_unix: 0
|
|
|
|
-
|
|
id: 14
|
|
repo_id: 11
|
|
name: 'master'
|
|
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
|
|
commit_message: 'Initial commit'
|
|
commit_time: 1489927679
|
|
pusher_id: 13
|
|
is_deleted: false
|
|
deleted_by_id: 0
|
|
deleted_unix: 0
|