diff options
| author | Unknwon <u@gogs.io> | 2015-11-18 23:01:06 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-18 23:01:06 -0500 |
| commit | 915bf1d2e329ff5d66eac2d475cd00f52f48c896 (patch) | |
| tree | 6b7ef462e8155ea1e33821704b0082db10519894 | |
| parent | f455125d4de8c788143a24edefb8c6b2cef0f524 (diff) | |
| parent | fc56f42dc35a60395ca8def114a23a6c7655c410 (diff) | |
| download | gitea-915bf1d2e329ff5d66eac2d475cd00f52f48c896.tar.gz gitea-915bf1d2e329ff5d66eac2d475cd00f52f48c896.zip | |
Merge pull request #1994 from arthuroy/develop
Fix #1965 - the hyperlink and the display name of the branch
| -rw-r--r-- | conf/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | modules/git/utils.go | 5 | ||||
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 30540d4791..23543a867a 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -966,7 +966,7 @@ notices.delete_success = System notice has been deleted successfully. [action] create_repo = created repository <a href="%s">%s</a> rename_repo = renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a> -commit_repo = pushed to <a href="%s/src/%s">%[2]s</a> at <a href="%[1]s">%[3]s</a> +commit_repo = pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> create_issue = `opened issue <a href="%s/issues/%s">%s#%[2]s</a>` create_pull_request = `created pull request <a href="%s/pulls/%s">%s#%[2]s</a>` comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>` diff --git a/modules/git/utils.go b/modules/git/utils.go index 78792aaf5e..d2d0c19ed9 100644 --- a/modules/git/utils.go +++ b/modules/git/utils.go @@ -35,6 +35,11 @@ func parsePrettyFormatLog(repo *Repository, logByts []byte) (*list.List, error) } func RefEndName(refStr string) string { + if strings.HasPrefix(refStr, "refs/heads/") { + // trim the "refs/heads/" + return refStr[len("refs/heads/"):] + } + index := strings.LastIndex(refStr, "/") if index != -1 { return refStr[index+1:] diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 70142f9a51..fff1e16f60 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -13,7 +13,8 @@ {{else if eq .GetOpType 2}} {{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} {{else if eq .GetOpType 5}} - {{$.i18n.Tr "action.commit_repo" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} + {{ $branchLink := .GetBranch | EscapePound}} + {{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .GetRepoPath | Str2html}} {{else if eq .GetOpType 6}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} |