From d2b53dd43b3bc9719985033bc92b76abb9515b4d Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sun, 13 Apr 2014 21:00:12 -0400
Subject: Add weibo oauth

---
 models/action.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'models/action.go')

diff --git a/models/action.go b/models/action.go
index a642a82c..3edb884e 100644
--- a/models/action.go
+++ b/models/action.go
@@ -8,6 +8,8 @@ import (
 	"encoding/json"
 	"time"
 
+	// "github.com/gogits/git"
+
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
 )
@@ -22,6 +24,7 @@ const (
 	OP_CREATE_ISSUE
 	OP_PULL_REQUEST
 	OP_TRANSFER_REPO
+	OP_PUSH_TAG
 )
 
 // Action represents user operation type and other information to repository.,
@@ -67,7 +70,14 @@ func (a Action) GetContent() string {
 // CommitRepoAction adds new action for committing repository.
 func CommitRepoAction(userId int64, userName, actEmail string,
 	repoId int64, repoName string, refName string, commit *base.PushCommits) error {
-	log.Trace("action.CommitRepoAction(start): %d/%s", userId, repoName)
+	// log.Trace("action.CommitRepoAction(start): %d/%s", userId, repoName)
+
+	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{}
+	// }
 
 	bs, err := json.Marshal(commit)
 	if err != nil {
@@ -76,7 +86,7 @@ func CommitRepoAction(userId int64, userName, actEmail string,
 	}
 
 	if err = NotifyWatchers(&Action{ActUserId: userId, ActUserName: userName, ActEmail: actEmail,
-		OpType: OP_COMMIT_REPO, Content: string(bs), RepoId: repoId, RepoName: repoName, RefName: refName}); err != nil {
+		OpType: opType, Content: string(bs), RepoId: repoId, RepoName: repoName, RefName: refName}); err != nil {
 		log.Error("action.CommitRepoAction(notify watchers): %d/%s", userId, repoName)
 		return err
 	}
-- 
cgit v1.2.3


From 190b83e05eb1ade979c0e17314ab892832d62e5b Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sun, 13 Apr 2014 22:20:28 -0400
Subject: push tag support

---
 models/action.go            | 13 ++++++++-----
 models/update.go            |  2 +-
 templates/release/list.tmpl |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'models/action.go')

diff --git a/models/action.go b/models/action.go
index 3edb884e..a9a41a9f 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 ba0e9793..2f59547b 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 d7c4674e..9541265c 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">
-- 
cgit v1.2.3