diff options
| author | zeripath <art27@cantab.net> | 2020-01-07 17:06:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 17:06:14 +0000 |
| commit | e5d8e2d10c6798e57ac855f71b025b087b664799 (patch) | |
| tree | e00324f545d553aa1ef7ccf693b95577c5dd67a1 /integrations/gitea-repositories-meta | |
| parent | 940636863370855f39688ddf0aae41667ac8935c (diff) | |
| download | gitea-e5d8e2d10c6798e57ac855f71b025b087b664799.tar.gz gitea-e5d8e2d10c6798e57ac855f71b025b087b664799.zip | |
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
Diffstat (limited to 'integrations/gitea-repositories-meta')
4 files changed, 1 insertions, 0 deletions
diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/integrations/gitea-repositories-meta/user2/repo1.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba Binary files differnew file mode 100644 index 0000000000..d3c45d51ea --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 b/integrations/gitea-repositories-meta/user2/repo1.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 Binary files differnew file mode 100644 index 0000000000..bf97d00fd8 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b b/integrations/gitea-repositories-meta/user2/repo1.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b Binary files differnew file mode 100644 index 0000000000..7678d6754d --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head new file mode 100644 index 0000000000..98593d6537 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head @@ -0,0 +1 @@ +4a357436d925b5c974181ff12a994538ddc5a269 |