Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support shortened commit SHAs in URLs #13686

Merged
merged 6 commits into from
Nov 25, 2020
Merged

Support shortened commit SHAs in URLs #13686

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79a1cb9
Support shortened commit SHAs in URLs and API
lafriks Nov 24, 2020
a7418f9
Add test case for short sha
lafriks Nov 24, 2020
c05ea2b
Fix format
lafriks Nov 24, 2020
0358e92
Revert API support
lafriks Nov 24, 2020
d0ea927
Add canonical link headers for short commit ID URLs
lafriks Nov 25, 2020
a9220ec
Merge branch 'master' into feat/short_commitsha
lafriks Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add canonical link headers for short commit ID URLs
  • Loading branch information
@lafriks
lafriks committed Nov 25, 2020
commit d0ea9273d6b430996745581d0e25f30e4ef14948
6 changes: 6 additions & 0 deletions modules/context/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"

"gitea.com/macaron/macaron"
"github.com/editorconfig/editorconfig-core-go/v2"
Expand Down Expand Up @@ -790,6 +791,11 @@ func RepoRefByType(refType RepoRefType) macaron.Handler {
ctx.NotFound("GetCommit", err)
return
}
// If short commit ID add canonical link header
if len(refName) < 40 {
ctx.Header().Set("Link", fmt.Sprintf("<%s>; rel=\"canonical\"",
util.URLJoin(setting.AppURL, strings.Replace(ctx.Req.URL.RequestURI(), refName, ctx.Repo.Commit.ID.String(), 1))))
}
} else {
ctx.NotFound("RepoRef invalid repo", fmt.Errorf("branch or tag not exist: %s", refName))
return
Expand Down