target go1.12

Changelog for v1.9.3 (#8117 )
* Changelog for 1.9.3 * Fix ref to 8071 * Correct punctuation Co-Authored-By: techknowlogick <matti@mdranta.net>
2025-08-16 15:30:41 +02:00 · 2019-09-07 12:40:52 -04:00 · 2019-09-06 12:25:24 -04:00 · 2019-09-06 09:59:03 -04:00 · 2019-09-04 16:37:09 +02:00 · 2019-09-03 22:58:19 +03:00
17 changed files with 90 additions and 30 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -362,7 +362,7 @@ steps:

  - name: static
    pull: always
-    image: techknowlogick/xgo:latest
+    image: techknowlogick/xgo:go-1.12.x
    commands:
      - export PATH=$PATH:$GOPATH/bin
      - make generate
@@ -463,7 +463,7 @@ steps:

  - name: static
    pull: always
-    image: techknowlogick/xgo:latest
+    image: techknowlogick/xgo:go-1.12.x
    commands:
      - export PATH=$PATH:$GOPATH/bin
      - make generate
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).

+## [1.9.3](https://github.com/go-gitea/gitea/releases/tag/v1.9.3) - 2019-09-06
+* BUGFIXES
+  * Fix go get from a private repository with Go 1.13 (#8100)
+  * Strict name matching for Repository.GetTagID() (#8082)
+  * Avoid ambiguity of branch/directory names for the git-diff-tree command (#8070)
+  * Add change title notification for issues (#8064)
+  * Run CORS handler first for /api routes (#7967) (#8053)
+  * Evaluate emojis in commit messages in list view (#8044)
+  * Fix failed to synchronize tags to releases for repository (#7990) (#7994)
+  * Fix adding default Telegram webhook (#7972) (#7992)
+  * Abort synchronization from LDAP source if there is some error (#7965)
+  * Fix deformed emoji in commit message (#8071)
+* ENHANCEMENT
+  * Keep blame view buttons sequence consistent with normal view when viewing a file (#8007) (#8009)
+
 ## [1.9.2](https://github.com/go-gitea/gitea/releases/tag/v1.9.2) - 2019-08-22
 * BUGFIXES
  * Fix wrong sender when send slack webhook (#7918) (#7924)
--- a/models/user.go
+++ b/models/user.go
@@ -1645,7 +1645,12 @@ func SyncExternalUsers() {
 				return
 			}

-			sr := s.LDAP().SearchEntries()
+			sr, err := s.LDAP().SearchEntries()
+			if err != nil {
+				log.Error("SyncExternalUsers LDAP source failure [%s], skipped", s.Name)
+				continue
+			}
+
 			for _, su := range sr {
 				if len(su.Username) == 0 {
 					continue
--- a/modules/auth/ldap/ldap.go
+++ b/modules/auth/ldap/ldap.go
@@ -308,12 +308,12 @@ func (ls *Source) UsePagedSearch() bool {
 }

 // SearchEntries : search an LDAP source for all users matching userFilter
-func (ls *Source) SearchEntries() []*SearchResult {
+func (ls *Source) SearchEntries() ([]*SearchResult, error) {
 	l, err := dial(ls)
 	if err != nil {
 		log.Error("LDAP Connect error, %s:%v", ls.Host, err)
 		ls.Enabled = false
-		return nil
+		return nil, err
 	}
 	defer l.Close()

@@ -321,7 +321,7 @@ func (ls *Source) SearchEntries() []*SearchResult {
 		err := l.Bind(ls.BindDN, ls.BindPassword)
 		if err != nil {
 			log.Debug("Failed to bind as BindDN[%s]: %v", ls.BindDN, err)
-			return nil
+			return nil, err
 		}
 		log.Trace("Bound as BindDN %s", ls.BindDN)
 	} else {
@@ -350,7 +350,7 @@ func (ls *Source) SearchEntries() []*SearchResult {
 	}
 	if err != nil {
 		log.Error("LDAP Search failed unexpectedly! (%v)", err)
-		return nil
+		return nil, err
 	}

 	result := make([]*SearchResult, len(sr.Entries))
@@ -368,5 +368,5 @@ func (ls *Source) SearchEntries() []*SearchResult {
 		}
 	}

-	return result
+	return result, nil
 }
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -249,6 +249,19 @@ func Contexter() macaron.Handler {
 		if ctx.Query("go-get") == "1" {
 			ownerName := c.Params(":username")
 			repoName := c.Params(":reponame")
+			trimmedRepoName := strings.TrimSuffix(repoName, ".git")
+
+			if ownerName == "" || trimmedRepoName == "" {
+				_, _ = c.Write([]byte(`<!doctype html>
+<html>
+	<body>
+		invalid import path
+	</body>
+</html>
+`))
+				c.WriteHeader(400)
+				return
+			}
 			branchName := "master"

 			repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
@@ -276,7 +289,7 @@ func Contexter() macaron.Handler {
 	</body>
 </html>
 `, map[string]string{
-				"GoGetImport":    ComposeGoGetImport(ownerName, strings.TrimSuffix(repoName, ".git")),
+				"GoGetImport":    ComposeGoGetImport(ownerName, trimmedRepoName),
 				"CloneLink":      models.ComposeHTTPSCloneURL(ownerName, repoName),
 				"GoDocDirectory": prefix + "{/dir}",
 				"GoDocFile":      prefix + "{/dir}/{file}#L{line}",
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -201,10 +201,14 @@ func ComposeGoGetImport(owner, repo string) string {
 // .netrc file.
 func EarlyResponseForGoGetMeta(ctx *Context) {
 	username := ctx.Params(":username")
-	reponame := ctx.Params(":reponame")
+	reponame := strings.TrimSuffix(ctx.Params(":reponame"), ".git")
+	if username == "" || reponame == "" {
+		ctx.PlainText(400, []byte("invalid repository path"))
+		return
+	}
 	ctx.PlainText(200, []byte(com.Expand(`<meta name="go-import" content="{GoGetImport} git {CloneLink}">`,
 		map[string]string{
-			"GoGetImport": ComposeGoGetImport(username, strings.TrimSuffix(reponame, ".git")),
+			"GoGetImport": ComposeGoGetImport(username, reponame),
 			"CloneLink":   models.ComposeHTTPSCloneURL(username, reponame),
 		})))
 }
--- a/modules/git/repo_tag.go
+++ b/modules/git/repo_tag.go
@@ -153,15 +153,18 @@ func (repo *Repository) GetTagNameBySHA(sha string) (string, error) {

 // GetTagID returns the object ID for a tag (annotated tags have both an object SHA AND a commit SHA)
 func (repo *Repository) GetTagID(name string) (string, error) {
-	stdout, err := NewCommand("show-ref", "--", name).RunInDir(repo.Path)
+	stdout, err := NewCommand("show-ref", "--tags", "--", name).RunInDir(repo.Path)
 	if err != nil {
 		return "", err
 	}
-	fields := strings.Fields(stdout)
-	if len(fields) != 2 {
-		return "", ErrNotExist{ID: name}
+	// Make sure exact match is used: "v1" != "release/v1"
+	for _, line := range strings.Split(stdout, "\n") {
+		fields := strings.Fields(line)
+		if len(fields) == 2 && fields[1] == "refs/tags/"+name {
+			return fields[0], nil
+		}
 	}
-	return fields[0], nil
+	return "", ErrNotExist{ID: name}
 }

 // GetTag returns a Git tag by given name.
--- a/modules/git/repo_tag_test.go
+++ b/modules/git/repo_tag_test.go
@@ -62,6 +62,16 @@ func TestRepository_GetTag(t *testing.T) {
 	assert.NotEqual(t, aTagID, aTag.Object.String())
 	assert.EqualValues(t, aTagCommitID, aTag.Object.String())
 	assert.EqualValues(t, "tag", aTag.Type)
+
+	rTagCommitID := "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0"
+	rTagName := "release/" + lTagName
+	bareRepo1.CreateTag(rTagName, rTagCommitID)
+	rTagID, err := bareRepo1.GetTagID(rTagName)
+	assert.NoError(t, err)
+	assert.EqualValues(t, rTagCommitID, rTagID)
+	oTagID, err := bareRepo1.GetTagID(lTagName)
+	assert.NoError(t, err)
+	assert.EqualValues(t, lTagCommitID, oTagID)
 }

 func TestRepository_GetAnnotatedTag(t *testing.T) {
--- a/modules/pull/merge.go
+++ b/modules/pull/merge.go
@@ -299,8 +299,7 @@ func getDiffTree(repoPath, baseBranch, headBranch string) (string, error) {
 	getDiffTreeFromBranch := func(repoPath, baseBranch, headBranch string) (string, error) {
 		var outbuf, errbuf strings.Builder
 		// Compute the diff-tree for sparse-checkout
-		// The branch argument must be enclosed with double-quotes ("") in case it contains slashes (e.g "feature/test")
-		if err := git.NewCommand("diff-tree", "--no-commit-id", "--name-only", "-r", "--root", baseBranch, headBranch).RunInDirPipeline(repoPath, &outbuf, &errbuf); err != nil {
+		if err := git.NewCommand("diff-tree", "--no-commit-id", "--name-only", "-r", "--root", baseBranch, headBranch, "--").RunInDirPipeline(repoPath, &outbuf, &errbuf); err != nil {
 			return "", fmt.Errorf("git diff-tree [%s base:%s head:%s]: %s", repoPath, baseBranch, headBranch, errbuf.String())
 		}
 		return outbuf.String(), nil
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -668,6 +668,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .repository .diff-file-box .code-diff-split tbody tr td:nth-child(4){border-left-width:1px;border-left-style:solid}
 .repository .diff-file-box.file-content{clear:right}
 .repository .diff-file-box.file-content img{max-width:100%;padding:5px 5px 0 5px}
+.repository .diff-file-box.file-content img.emoji{padding:0}
 .repository .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
 .repository .repo-search-result{padding-top:10px;padding-bottom:10px}
 .repository .repo-search-result .lines-num a{color:inherit}
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -1544,6 +1544,9 @@
                max-width: 100%;
                padding: 5px 5px 0 5px;
            }
+            img.emoji {
+                padding: 0;
+            }

            clear: right;
        }
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -74,7 +74,6 @@ import (
 	"code.gitea.io/gitea/routers/api/v1/user"

 	"github.com/go-macaron/binding"
-	"github.com/go-macaron/cors"
 	macaron "gopkg.in/macaron.v1"
 )

@@ -501,12 +500,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/swagger", misc.Swagger) //Render V1 by default
 	}

-	var handlers []macaron.Handler
-	if setting.EnableCORS {
-		handlers = append(handlers, cors.CORS(setting.CORSConfig))
-	}
-	handlers = append(handlers, securityHeaders(), context.APIContexter(), sudo())
-
 	m.Group("/v1", func() {
 		// Miscellaneous
 		if setting.API.EnableSwagger {
@@ -852,7 +845,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Group("/topics", func() {
 			m.Get("/search", repo.TopicSearch)
 		})
-	}, handlers...)
+	}, securityHeaders(), context.APIContexter(), sudo())
 }

 func securityHeaders() macaron.Handler {
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -1047,11 +1047,14 @@ func UpdateIssueTitle(ctx *context.Context) {
 		return
 	}

+	oldTitle := issue.Title
 	if err := issue.ChangeTitle(ctx.User, title); err != nil {
 		ctx.ServerError("ChangeTitle", err)
 		return
 	}

+	notification.NotifyIssueChangeTitle(ctx.User, issue, oldTitle)
+
 	ctx.JSON(200, map[string]interface{}{
 		"title": issue.Title,
 	})
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -38,6 +38,7 @@ import (
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
 	"github.com/go-macaron/captcha"
+	"github.com/go-macaron/cors"
 	"github.com/go-macaron/csrf"
 	"github.com/go-macaron/i18n"
 	"github.com/go-macaron/session"
@@ -440,6 +441,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
 			m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
 			m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost)
+			m.Post("/telegram/new", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksNewPost)
 			m.Post("/msteams/new", bindIgnErr(auth.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost)
 			m.Get("/:id", repo.WebHooksEdit)
 			m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
@@ -447,6 +449,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
 			m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost)
 			m.Post("/dingtalk/:id", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksEditPost)
+			m.Post("/telegram/:id", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksEditPost)
 			m.Post("/msteams/:id", bindIgnErr(auth.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost)
 		})

@@ -945,9 +948,14 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/swagger.v1.json", templates.JSONRenderer(), routers.SwaggerV1Json)
 	}

+	var handlers []macaron.Handler
+	if setting.EnableCORS {
+		handlers = append(handlers, cors.CORS(setting.CORSConfig))
+	}
+	handlers = append(handlers, ignSignIn)
 	m.Group("/api", func() {
 		apiv1.RegisterRoutes(m)
-	}, ignSignIn)
+	}, handlers...)

 	m.Group("/api/internal", func() {
 		// package name internal is ideal but Golang is not allowed, so we use private as package name.
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -20,6 +20,8 @@
 					<img class="img-13" src="{{AppSubUrl}}/img/discord.png">
 				{{else if eq .HookType "dingtalk"}}
 					<img class="img-13" src="{{AppSubUrl}}/img/dingtalk.ico">
+				{{else if eq .HookType "telegram"}}
+					<img class="img-13" src="{{AppSubUrl}}/img/telegram.png">
 				{{else if eq .HookType "msteams"}}
 					<img class="img-13" src="{{AppSubUrl}}/img/msteams.png">
 				{{end}}
@@ -31,6 +33,7 @@
 			{{template "repo/settings/webhook/slack" .}}
 			{{template "repo/settings/webhook/discord" .}}
 			{{template "repo/settings/webhook/dingtalk" .}}
+			{{template "repo/settings/webhook/telegram" .}}
 			{{template "repo/settings/webhook/msteams" .}}
 		</div>

--- a/templates/repo/blame.tmpl
+++ b/templates/repo/blame.tmpl
@@ -9,12 +9,12 @@
 			<div class="eight wide right aligned column">
                <div class="ui right file-actions">
                    <div class="ui buttons">
+                        <a class="ui button" href="{{EscapePound $.RawFileLink}}">{{.i18n.Tr "repo.file_raw"}}</a>
                        {{if not .IsViewCommit}}
                            <a class="ui button" href="{{.RepoLink}}/src/commit/{{.CommitID}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_permalink"}}</a>
                        {{end}}
                        <a class="ui button" href="{{.RepoLink}}/src/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.normal_view"}}</a>
                        <a class="ui button" href="{{.RepoLink}}/commits/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_history"}}</a>
-                        <a class="ui button" href="{{EscapePound $.RawFileLink}}">{{.i18n.Tr "repo.file_raw"}}</a>
                    </div>
                    {{if .Repository.CanEnableEditor}}
                        {{if .CanEditFile}}
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -81,8 +81,8 @@
 						</span>
 					</td>
 				{{end}}
-				<td class="message has-emoji">
-					<span class="truncate">
+				<td class="message">
+					<span class="truncate has-emoji">
 						<a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary}}</a>
 					</span>
 				</td>
Author	SHA1	Message	Date
Matti R	2f71571305	target go1.12	2019-09-07 12:40:52 -04:00
guillep2k	a182a80f7c	Changelog for v1.9.3 (#8117 ) * Changelog for 1.9.3 * Fix ref to 8071 * Correct punctuation Co-Authored-By: techknowlogick <matti@mdranta.net>	2019-09-06 12:25:24 -04:00
Rutger Broekhoff	89c57487cd	Fix Go 1.13 private repository go get issue (#8100 ) * Fix Go 1.13 invalid import path creation Signed-off-by: Rutger Broekhoff <rutger@viasalix.nl> * Apply suggested changes from #8100 Signed-off-by: Rutger Broekhoff <rutger@viasalix.nl>	2019-09-06 09:59:03 -04:00
guillep2k	bb609cacee	Backport: Strict name matching for Repository.GetTagID() (#8082 ) * Strict name matching for Repository.GetTagID() * Add test for GetTagID()	2019-09-04 16:37:09 +02:00
Mura Li	e7f6da386f	Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066 ) (#8070 )	2019-09-03 22:58:19 +03:00
Mario Lubenka	7727f84fe8	Bugfix/deformed emoji in commit message (backport 1.9) (#8071 ) * Fixes deformed emoji in pull request comments or reviews Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Generate css via command Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>	2019-09-03 18:05:47 +02:00
guillep2k	5d2676089e	Add change title notification for issues (#8064 )	2019-09-03 11:39:53 +08:00
Tamal Saha	9bea8d825b	Run CORS handler first for /api routes (#7967 ) (#8053 ) Signed-off-by: Tamal Saha <tamal@appscode.com>	2019-09-02 08:55:33 +03:00
Mario Lubenka	3cc728870a	Evaluate emojis in commit messages in list view (#7906 ) (#8044 ) Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> (cherry picked from commit `08c63190c6`)	2019-08-31 21:12:08 +08:00
Lunny Xiao	0793b5e9c0	keep blame view buttons sequence consistent with normal view when view a file (#8007 ) (#8009 )	2019-08-28 08:11:41 +02:00
Richard Mahn	bb423f9350	Backport for #7945 (#7994 )	2019-08-27 07:01:16 +02:00
Gary Kim	4d6c8d9b13	backport: Fix adding default Telegram webhook (#7992 ) Signed-off-by: Gary Kim <gary@garykim.dev>	2019-08-27 12:24:25 +08:00
David Svantesson	b6b1560701	Abort syncrhonization from LDAP source if there is some error. (#7965 ) Signed-off-by: David Svantesson <davidsvantesson@gmail.com> (cherry picked from commit `b2d23a1389`)	2019-08-25 02:59:21 +02:00