]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9406368) | patch
Branches not at ref commit ID should not be listed as Merged (#9614)
authorzeripath <art27@cantab.net>
Tue, 7 Jan 2020 17:06:14 +0000 (17:06 +0000)
committerGitHub <noreply@github.com>
Tue, 7 Jan 2020 17:06:14 +0000 (17:06 +0000)
commite5d8e2d10c6798e57ac855f71b025b087b664799
treee00324f545d553aa1ef7ccf693b95577c5dd67a1tree | snapshot
parent940636863370855f39688ddf0aae41667ac8935ccommit | diff
Branches not at ref commit ID should not be listed as Merged (#9614)

Once a branch has been merged if the commit ID no longer equals that of
the pulls ref commit id don't offer to delete the branch on the pull screen
and don't list it as merged on branches.

Fix #9201

When looking at the pull page we should also get the commits from the refs/pulls/x/head

Fix #9158
integrations/gitea-repositories-meta/user2/repo1.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba [new file with mode: 0644] blob
integrations/gitea-repositories-meta/user2/repo1.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 [new file with mode: 0644] blob
integrations/gitea-repositories-meta/user2/repo1.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b [new file with mode: 0644] blob
integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head [new file with mode: 0644] blob
models/pull.go diff | blob | history
routers/repo/branch.go diff | blob | history
routers/repo/issue.go diff | blob | history
routers/repo/pull.go diff | blob | history
templates/repo/branch/list.tmpl diff | blob | history
templates/repo/issue/view_content/pull.tmpl diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea