diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-13 22:20:28 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-13 22:20:28 -0400 |
| commit | 190b83e05eb1ade979c0e17314ab892832d62e5b (patch) | |
| tree | ebf8b9c6c7f8f383cfc057c3f33aa984f698a428 | |
| parent | d2b53dd43b3bc9719985033bc92b76abb9515b4d (diff) | |
| download | gitea-190b83e05eb1ade979c0e17314ab892832d62e5b.tar.gz gitea-190b83e05eb1ade979c0e17314ab892832d62e5b.zip | |
push tag support
| -rw-r--r-- | models/action.go | 13 | ||||
| -rw-r--r-- | models/update.go | 2 | ||||
| -rw-r--r-- | templates/release/list.tmpl | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/models/action.go b/models/action.go index 3edb884e27..a9a41a9f4d 100644 --- a/models/action.go +++ b/models/action.go @@ -6,9 +6,10 @@ package models import ( "encoding/json" + "strings" "time" - // "github.com/gogits/git" + "github.com/gogits/git" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" @@ -74,10 +75,12 @@ func CommitRepoAction(userId int64, userName, actEmail string, opType := OP_COMMIT_REPO // Check it's tag push or branch. - // if git.IsTagExist(RepoPath(userName, repoName), refName) { - // opType = OP_PUSH_TAG - // commit = &base.PushCommits{} - // } + if strings.HasPrefix(refName, "refs/tags/") { + opType = OP_PUSH_TAG + commit = &base.PushCommits{} + } + + refName = git.RefEndName(refName) bs, err := json.Marshal(commit) if err != nil { diff --git a/models/update.go b/models/update.go index ba0e979348..2f59547b72 100644 --- a/models/update.go +++ b/models/update.go @@ -78,7 +78,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoName string, userId //commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()}) if err = CommitRepoAction(userId, userName, actEmail, - repos.Id, repoName, git.RefEndName(refName), &base.PushCommits{l.Len(), commits}); err != nil { + repos.Id, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil { qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err) } } diff --git a/templates/release/list.tmpl b/templates/release/list.tmpl index d7c4674e84..9541265c94 100644 --- a/templates/release/list.tmpl +++ b/templates/release/list.tmpl @@ -5,8 +5,8 @@ <div id="body" class="container"> <div id="release"> <h4 id="release-head"> - <span class="release"><strong>Release</strong></span> / - <a class="tag" href="/{tag_link}">Tags</a> + <span class="release"><strong>Releases</strong></span><!-- / + <a class="tag" href="/{tag_link}">Tags</a> --> <!-- comment : if in tag page, show a.release and span.tag please --> </h4> <ul id="release-list" class="list-unstyled"> |