Add changelog for release v1.2.0-rc2 (#2469)

1.2.0-dev is less than 1.2.0, according to semver

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [go-gitea/gitea](https://github.com/1.2.0/releases/tag/v1.2.0-rc1) - 2017-08-25
+## [1.2.0-rc2](https://github.com/go-gitea/gitea/releases/tag/v1.2.0-rc2) - 2017-09-06
+* BUGFIXES
+  * Fix migration from pre-v15 to 1.2.0 (#2460)
+  * Fix autolink javascript bug
+  * Fix releases to be counted from database not tags (#2389)
+  * fix duplicated feed (#2370)
+  * Set version to 1.2.0-dev
+
+## [1.2.0-rc1](https://github.com/go-gitea/gitea/releases/tag/v1.2.0-rc1) - 2017-08-25
 * BREAKING
   * Rename /forget_password url to /forgot_password (#1219)
   * SSH keys management URL changed from `/user/settings/ssh` to `/user/settings/keys` (#1293)

main.go

@@ -17,7 +17,7 @@ import (
 )
 
 // Version holds the current Gitea version
-var Version = "1.1.0+dev"
+var Version = "1.2.0-dev"
 
 // Tags holds the build tags used
 var Tags = ""

models/action.go

@@ -713,7 +713,6 @@ type GetFeedsOptions struct {
 	IncludePrivate   bool // include private actions
 	OnlyPerformedBy  bool // only actions performed by requested user
 	IncludeDeleted   bool // include deleted actions
-	Collaborate      bool // Include collaborative repositories
 }
 
 // GetFeeds returns actions according to the provided options
@@ -733,13 +732,7 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
 		cond = cond.And(builder.In("repo_id", repoIDs))
 	}
 
-	var userIDCond builder.Cond = builder.Eq{"user_id": opts.RequestedUser.ID}
-	if opts.Collaborate {
-		userIDCond = userIDCond.Or(builder.Expr(
-			"repo_id IN (SELECT repo_id FROM `access` WHERE access.user_id = ?)",
-			opts.RequestedUser.ID))
-	}
-	cond = cond.And(userIDCond)
+	cond = cond.And(builder.Eq{"user_id": opts.RequestedUser.ID})
 
 	if opts.OnlyPerformedBy {
 		cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID})

models/migrations/v15.go

@@ -12,6 +12,7 @@ import (
 
 // UserV15 describes the added field for User
 type UserV15 struct {
+	KeepEmailPrivate        bool
 	AllowCreateOrganization bool
 }
 

models/repo.go

@@ -193,7 +193,7 @@ type Repository struct {
 	NumMilestones       int `xorm:"NOT NULL DEFAULT 0"`
 	NumClosedMilestones int `xorm:"NOT NULL DEFAULT 0"`
 	NumOpenMilestones   int `xorm:"-"`
-	NumTags             int `xorm:"-"`
+	NumReleases         int `xorm:"-"`
 
 	IsPrivate bool `xorm:"INDEX"`
 	IsBare    bool `xorm:"INDEX"`

modules/context/repo.go

@@ -275,7 +275,15 @@ func RepoAssignment() macaron.Handler {
 			return
 		}
 		ctx.Data["Tags"] = tags
-		ctx.Repo.Repository.NumTags = len(tags)
+
+		count, err := models.GetReleaseCountByRepoID(ctx.Repo.Repository.ID, models.FindReleasesOptions{
+			IncludeDrafts: false,
+		})
+		if err != nil {
+			ctx.Handle(500, "GetReleaseCountByRepoID", err)
+			return
+		}
+		ctx.Repo.Repository.NumReleases = int(count)
 
 		ctx.Data["Title"] = owner.Name + "/" + repo.Name
 		ctx.Data["Repository"] = repo

public/vendor/plugins/autolink/autolink.js

@@ -26,7 +26,7 @@
         re.lastIndex = 0;
         var results = re.exec(node.textContent);
         if(results !== null) {
-            if($(node).parents().filter('pre>code').length === 0) {
+            if($(node).parents().filter('code').length === 0) {
                 $(node).replaceWith(
                     $('<span />').html(
                         node.nodeValue.replace(re, '<a href="$1">$1</a>')

routers/user/home.go

@@ -156,7 +156,6 @@ func Dashboard(ctx *context.Context) {
 	retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
 		IncludePrivate:  true,
 		OnlyPerformedBy: false,
-		Collaborate:     true,
 		IncludeDeleted:  false,
 	})
 	if ctx.Written() {

routers/user/profile.go

@@ -141,7 +141,6 @@ func Profile(ctx *context.Context) {
 		retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
 			IncludePrivate:  showPrivate,
 			OnlyPerformedBy: true,
-			Collaborate:     true,
 			IncludeDeleted:  false,
 		})
 		if ctx.Written() {

templates/repo/header.tmpl

@@ -81,7 +81,7 @@
 
 			{{if and (.Repository.UnitEnabled $.UnitTypeReleases) (not .IsBareRepo) }}
 			<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
-				<i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
+				<i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumReleases}}gray{{else}}blue{{end}} small label">{{.Repository.NumReleases}}</span>
 			</a>
 			{{end}}