Show source/target branches on PR's list

custom/conf/app.example.ini

@@ -1135,6 +1135,9 @@ PATH =
 ;; Whether to enable a Service Worker to cache frontend assets
 ;USE_SERVICE_WORKER = false
 
+;; Whether the source/target branches on pull requests list shown
+;SHOW_BRANCHES_ON_PR_LIST = true
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;[ui.admin]

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -190,6 +190,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
 - `USE_SERVICE_WORKER`: **false**: Whether to enable a Service Worker to cache frontend assets.
+- `SHOW_BRANCHES_ON_PR_LIST`: **true**: Whether the source/target branches on pull requests list shown.
 
 ### UI - Admin (`ui.admin`)
 

models/issue_list.go

@@ -27,11 +27,17 @@ const (
 func (issues IssueList) getRepoIDs() []int64 {
 	repoIDs := make(map[int64]struct{}, len(issues))
 	for _, issue := range issues {
-		if issue.Repo != nil {
-			continue
+		// Check if Repo not initialized
+		if issue.Repo == nil {
+			if _, ok := repoIDs[issue.RepoID]; !ok {
+				repoIDs[issue.RepoID] = struct{}{}
+			}
 		}
-		if _, ok := repoIDs[issue.RepoID]; !ok {
-			repoIDs[issue.RepoID] = struct{}{}
+		// Add Head repo for Pull Request (only if different)
+		if (issue.PullRequest != nil) && (issue.PullRequest.HeadRepoID != issue.RepoID) {
+			if _, ok := repoIDs[issue.PullRequest.HeadRepoID]; !ok {
+				repoIDs[issue.PullRequest.HeadRepoID] = struct{}{}
+			}
 		}
 	}
 	return container.KeysInt64(repoIDs)
@@ -66,8 +72,13 @@ func (issues IssueList) loadRepositories(e db.Engine) ([]*repo_model.Repository,
 		} else {
 			repoMaps[issue.RepoID] = issue.Repo
 		}
-		if issue.PullRequest != nil && issue.PullRequest.BaseRepo == nil {
-			issue.PullRequest.BaseRepo = issue.Repo
+		if issue.PullRequest != nil {
+			if issue.PullRequest.BaseRepo == nil {
+				issue.PullRequest.BaseRepo = issue.Repo
+			}
+			if issue.PullRequest.HeadRepo == nil {
+				issue.PullRequest.HeadRepo = repoMaps[issue.PullRequest.HeadRepoID]
+			}
 		}
 	}
 	return valuesRepository(repoMaps), nil

modules/setting/setting.go

@@ -228,6 +228,7 @@ var (
 		CustomEmojisMap       map[string]string `ini:"-"`
 		SearchRepoDescription bool
 		UseServiceWorker      bool
+		ShowBranchesOnPrList  bool
 
 		Notification struct {
 			MinTimeout            time.Duration
@@ -1069,6 +1070,7 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
 	UI.DefaultShowFullName = Cfg.Section("ui").Key("DEFAULT_SHOW_FULL_NAME").MustBool(false)
 	UI.SearchRepoDescription = Cfg.Section("ui").Key("SEARCH_REPO_DESCRIPTION").MustBool(true)
 	UI.UseServiceWorker = Cfg.Section("ui").Key("USE_SERVICE_WORKER").MustBool(false)
+	UI.ShowBranchesOnPrList = Cfg.Section("ui").Key("SHOW_BRANCHES_ON_PR_LIST").MustBool(true)
 
 	HasRobotsTxt, err = util.IsFile(path.Join(CustomPath, "robots.txt"))
 	if err != nil {

routers/web/repo/issue.go

@@ -390,6 +390,7 @@ func Issues(ctx *context.Context) {
 		}
 		ctx.Data["Title"] = ctx.Tr("repo.pulls")
 		ctx.Data["PageIsPullList"] = true
+		ctx.Data["ShowBranchesOnPrList"] = setting.UI.ShowBranchesOnPrList
 	} else {
 		MustEnableIssues(ctx)
 		if ctx.Written() {

routers/web/user/home.go

@@ -615,6 +615,8 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 
 	ctx.Data["Issues"] = issues
 
+	ctx.Data["ShowBranchesOnPrList"] = setting.UI.ShowBranchesOnPrList
+
 	approvalCounts, err := models.IssueList(issues).GetApprovalCounts()
 	if err != nil {
 		ctx.ServerError("ApprovalCounts", err)

templates/shared/issuelist.tmpl

@@ -59,6 +59,29 @@
 					{{else}}
 						{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
 					{{end}}
+					{{if and .IsPull $.ShowBranchesOnPrList}}
+						<div class="branches">
+							<div class="branch">
+								<a style="font-weight: bold;" href="/{{if .PullRequest.BaseRepo}}{{.PullRequest.BaseRepo.OwnerName}}/{{.PullRequest.BaseRepo.LowerName}}{{end}}/src/branch/{{.PullRequest.BaseBranch}}">
+									{{if ne .RepoID .PullRequest.BaseRepoID}}
+										<div class="truncated-name dib vb">{{.PullRequest.BaseRepo.OwnerName}}</div><div class="truncated-name dib vb">:</div>
+									{{end}}
+									<div class="truncated-name dib vb">{{.PullRequest.BaseBranch}}</div>
+								</a>
+							</div>
+							<div class="pointer">
+								{{svg "gitea-double-chevron-left" 13  }}
+							</div>
+							<div class="branch">
+								<a style="font-weight: bold;" href="/{{if .PullRequest.HeadRepo}}{{.PullRequest.HeadRepo.OwnerName}}/{{.PullRequest.HeadRepo.LowerName}}{{end}}/src/branch/{{.PullRequest.HeadBranch}}">
+									{{if ne .RepoID .PullRequest.HeadRepoID}}
+										<div class="truncated-name dib vb">{{.PullRequest.HeadRepo.OwnerName}}</div><div class="truncated-name dib vb">:</div>
+									{{end}}
+									<div class="truncated-name dib vb">{{.PullRequest.HeadBranch}}</div>
+								</a>
+							</div>
+						</div>
+					{{end}}
 					{{if and .Milestone (ne $.listType "milestone")}}
 						<a class="milestone" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
 							{{svg "octicon-milestone" 14 "mr-2"}}{{.Milestone.Name}}

web_src/less/_base.less

@@ -95,6 +95,8 @@
   --color-info-border: #a9d5de;
   --color-info-bg: #f8ffff;
   --color-info-text: #276f86;
+  --color-pull-request-list-branch-bg: #e8e8e8;
+  --color-pull-request-arrow-svg: #00000057;
   /* target-based colors */
   --color-body: #ffffff;
   --color-text-dark: #080808;

web_src/less/helpers.less

@@ -15,6 +15,7 @@
 .f1 { flex: 1 !important; }
 .fw { flex-wrap: wrap !important; }
 .vm { vertical-align: middle !important; }
+.vb { vertical-align: bottom !important; }
 .w-100 { width: 100% !important; }
 .h-100 { height: 100% !important; }
 

web_src/less/shared/issuelist.less

@@ -127,6 +127,34 @@
     }
   }
 
+  .branches {
+    display: inline-flex;
+    padding: 0 6px;
+
+    .branch {
+      background-color: var(--color-pull-request-list-branch-bg);
+      border-radius: 3px;
+    }
+
+    .pointer {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 0 3px;
+
+      svg {
+        color: var(--color-pull-request-arrow-svg);
+      }
+    }
+
+    .truncated-name {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 10em;
+    }
+  }
+
   > .item + .item {
     border-top: 1px solid var(--color-secondary);
   }

web_src/less/themes/theme-arc-green.less

@@ -91,6 +91,8 @@
   --color-info-border: #306090;
   --color-info-bg: #26354c;
   --color-info-text: #38a8e8;
+  --color-pull-request-list-branch-bg: var(--color-secondary);
+  --color-pull-request-arrow-svg: var(--color-caret);
   /* target-based colors */
   --color-body: #383c4a;
   --color-box-header: #404652;