Starting v1.11.0 development

CHANGELOG.md

@@ -4,32 +4,6 @@ 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.10.0-RC2](https://github.com/go-gitea/gitea/releases/tag/v1.10.0-rc2) - 2019-10-30
-* BREAKING
-  * Fix deadline on update issue or PR via API (#8698)
-  * Hide some user information via API if user doesn't have enough permission (#8655) (#8657)
-* BUGFIXES
-  * Expose db.SetMaxOpenConns and allow non MySQL dbs to set conn pool params (#8528) (#8618)
-  * Fix milestone close timestamp (#8728) (#8730)
-  * Fix 500 when getting user as unauthenticated user (#8653) (#8663)
-  * Fix 'New Issue Missing Milestone Comment' (#8678) (#8681)
-  * Use AppSubUrl for more redirections (#8647) (#8651)
-  * Add SubURL to redirect path (#8632) (#8634)
-  * Fix template error on account page (#8562) (#8622)
-  * Allow externalID to be UUID (#8551) (#8624)
-  * Prevent removal of non-empty emoji panel following selection of duplicate (#8609) (#8623)
-  * Update heatmap fixtures to restore tests (#8615) (#8616)
-  * Ensure that diff stats can scroll independently of the diff (#8581) (#8621)
-  * Webhook: set Content-Type for application/x-www-form-urlencoded (#8600)
-  * Fix #8582 by handling empty repos (#8587) (#8594)
-  * Fix bug on pull requests when transfer head repository (#8564) (#8569)
-  * Add missed close in ServeBlobLFS (#8527) (#8542)
-  * Ensure that GitRepo is set on Empty repositories (#8539) (#8541)
-  * Fix migrate mirror 500 bug (#8526) (#8530)
-  * Fix password complexity regex for special characters (#8524)
-  * Prevent .code-view from overriding font on icon fonts (#8614) (#8627)
-  * Allow more than 255 characters for tokens in external_login_user table (#8554)
-
 ## [1.10.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.10.0-rc1) - 2019-10-14
 * BREAKING
   * Remove legacy handling of drone token (#8191)

custom/conf/app.ini.sample

@@ -277,12 +277,10 @@ LOG_SQL = true
 DB_RETRIES = 10
 ; Backoff time per DB retry (time.Duration)
 DB_RETRY_BACKOFF = 3s
-; Max idle database connections on connnection pool, default is 2
+; Max idle database connections on connnection pool, default is 0
-MAX_IDLE_CONNS = 2
+MAX_IDLE_CONNS = 0
-; Database connection max life time, default is 0 or 3s mysql (See #6804 & #7071 for reasoning)
+; Database connection max life time, default is 3s
 CONN_MAX_LIFETIME = 3s
-; Database maximum number of open connections, default is 0 meaning no maximum
-MAX_OPEN_CONNS = 0
 
 [indexer]
 ; Issue indexer type, currently support: bleve or db, default is bleve
@@ -335,8 +333,7 @@ IMPORT_LOCAL_PATHS = false
 ; Set to true to prevent all users (including admin) from creating custom git hooks
 DISABLE_GIT_HOOKS = false
 ;Comma separated list of character classes required to pass minimum complexity.
-;If left empty or no valid values are specified, the default values ("lower,upper,digit,spec") will be used.
+;If left empty or no valid values are specified, the default values (`lower,upper,digit,spec`) will be used.
-;Use "off" to disable checking.
 PASSWORD_COMPLEXITY = lower,upper,digit,spec
 ; Password Hash algorithm, either "pbkdf2", "argon2", "scrypt" or "bcrypt"
 PASSWORD_HASH_ALGO = pbkdf2
@@ -825,6 +822,6 @@ TOKEN =
 QUEUE_TYPE = channel
 ; Task queue length, available only when `QUEUE_TYPE` is `channel`.
 QUEUE_LENGTH = 1000
-; Task queue connection string, available only when `QUEUE_TYPE` is `redis`.
+; Task queue connction string, available only when `QUEUE_TYPE` is `redis`. 
 ; If there is a password of redis, use `addrs=127.0.0.1:6379 password=123 db=0`.
 QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0"

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -167,12 +167,8 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `LOG_SQL`: **true**: Log the executed SQL.
 - `DB_RETRIES`: **10**: How many ORM init / DB connect attempts allowed.
 - `DB_RETRY_BACKOFF`: **3s**: time.Duration to wait before trying another ORM init / DB connect attempt, if failure occured.
-- `MAX_OPEN_CONNS` **0**: Database maximum open connections - default is 0, meaning there is no limit.
+- `MAX_IDLE_CONNS` **0**: Max idle database connections on connnection pool, default is 0
-- `MAX_IDLE_CONNS` **2**: Max idle database connections on connnection pool, default is 2 - this will be capped to `MAX_OPEN_CONNS`.
+- `CONN_MAX_LIFETIME` **3s**: Database connection max lifetime
-- `CONN_MAX_LIFETIME` **0 or 3s**: Sets the maximum amount of time a DB connection may be reused - default is 0, meaning there is no limit (except on MySQL where it is 3s - see #6804 & #7071).
-  
-Please see #8540 & #8273 for further discussion of the appropriate values for `MAX_OPEN_CONNS`, `MAX_IDLE_CONNS` & `CONN_MAX_LIFETIME` and their
-relation to port exhaustion.
 
 ## Indexer (`indexer`)
 
@@ -216,8 +212,7 @@ relation to port exhaustion.
     - lower - use one or more lower latin characters
     - upper - use one or more upper latin characters
     - digit - use one or more digits
-    - spec - use one or more special characters as ``!"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~``
+    - spec - use one or more special characters as ``][!"#$%&'()*+,./:;<=>?@\^_{|}~`-`` and space symbol. 
-    - off - do not check password complexity
 
 ## OpenID (`openid`)
 

integrations/api_team_user_test.go

@@ -29,6 +29,7 @@ func TestAPITeamUser(t *testing.T) {
 	var user2 *api.User
 	DecodeJSON(t, resp, &user2)
 	user2.Created = user2.Created.In(time.Local)
+	user2.LastLogin = user2.LastLogin.In(time.Local)
 	user := models.AssertExistsAndLoadBean(t, &models.User{Name: "user2"}).(*models.User)
 
 	assert.Equal(t, convert.ToUser(user, true, false), user2)

integrations/api_user_heatmap_test.go

@@ -26,7 +26,7 @@ func TestUserHeatmap(t *testing.T) {
 	var heatmap []*models.UserHeatmapData
 	DecodeJSON(t, resp, &heatmap)
 	var dummyheatmap []*models.UserHeatmapData
-	dummyheatmap = append(dummyheatmap, &models.UserHeatmapData{Timestamp: 1571616000, Contributions: 1})
+	dummyheatmap = append(dummyheatmap, &models.UserHeatmapData{Timestamp: 1540080000, Contributions: 1})
 
 	assert.Equal(t, dummyheatmap, heatmap)
 }

models/external_login_user.go

@@ -28,9 +28,9 @@ type ExternalLoginUser struct {
 	Description       string
 	AvatarURL         string
 	Location          string
-	AccessToken       string `xorm:"TEXT"`
+	AccessToken       string
-	AccessTokenSecret string `xorm:"TEXT"`
+	AccessTokenSecret string
-	RefreshToken      string `xorm:"TEXT"`
+	RefreshToken      string
 	ExpiresAt         time.Time
 }
 
@@ -168,7 +168,7 @@ func FindExternalUsersByProvider(opts FindExternalUserOptions) ([]ExternalLoginU
 }
 
 // UpdateMigrationsByType updates all migrated repositories' posterid from gitServiceType to replace originalAuthorID to posterID
-func UpdateMigrationsByType(tp structs.GitServiceType, externalUserID string, userID int64) error {
+func UpdateMigrationsByType(tp structs.GitServiceType, externalUserID, userID int64) error {
 	if err := UpdateIssuesMigrationsByType(tp, externalUserID, userID); err != nil {
 		return err
 	}

models/fixtures/action.yml

@@ -5,7 +5,7 @@
   act_user_id: 2
   repo_id: 2
   is_private: true
-  created_unix: 1571686356
+  created_unix: 1540139562
 
 -
   id: 2

models/fixtures/pull_request.yml

@@ -6,6 +6,7 @@
   index: 2
   head_repo_id: 1
   base_repo_id: 1
+  head_user_name: user1
   head_branch: branch1
   base_branch: master
   merge_base: 1234567890abcdef
@@ -20,6 +21,7 @@
   index: 3
   head_repo_id: 1
   base_repo_id: 1
+  head_user_name: user1
   head_branch: branch2
   base_branch: master
   merge_base: fedcba9876543210
@@ -33,6 +35,7 @@
   index: 1
   head_repo_id: 11
   base_repo_id: 10
+  head_user_name: user13
   head_branch: branch2
   base_branch: master
   merge_base: 0abcb056019adb83

models/issue.go

@@ -1072,10 +1072,6 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 		if _, err = e.Exec("UPDATE `milestone` SET num_issues=num_issues+1 WHERE id=?", opts.Issue.MilestoneID); err != nil {
 			return err
 		}
-
-		if _, err = createMilestoneComment(e, doer, opts.Repo, opts.Issue, 0, opts.Issue.MilestoneID); err != nil {
-			return err
-		}
 	}
 
 	// Insert the assignees
@@ -1954,7 +1950,7 @@ func (issue *Issue) ResolveMentionsByVisibility(ctx DBContext, doer *User, menti
 }
 
 // UpdateIssuesMigrationsByType updates all migrated repositories' issues from gitServiceType to replace originalAuthorID to posterID
-func UpdateIssuesMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, posterID int64) error {
+func UpdateIssuesMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID, posterID int64) error {
 	_, err := x.Table("issue").
 		Where("repo_id IN (SELECT id FROM repository WHERE original_service_type = ?)", gitServiceType).
 		And("original_author_id = ?", originalAuthorID).

models/issue_comment.go

@@ -1025,7 +1025,7 @@ func FetchCodeComments(issue *Issue, currentUser *User) (CodeComments, error) {
 }
 
 // UpdateCommentsMigrationsByType updates comments' migrations information via given git service type and original id and poster id
-func UpdateCommentsMigrationsByType(tp structs.GitServiceType, originalAuthorID string, posterID int64) error {
+func UpdateCommentsMigrationsByType(tp structs.GitServiceType, originalAuthorID, posterID int64) error {
 	_, err := x.Table("comment").
 		Where(builder.In("issue_id",
 			builder.Select("issue.id").

models/issue_milestone.go

@@ -306,11 +306,7 @@ func ChangeMilestoneStatus(m *Milestone, isClosed bool) (err error) {
 	}
 
 	m.IsClosed = isClosed
-	if isClosed {
+	if _, err := sess.ID(m.ID).Cols("is_closed").Update(m); err != nil {
-		m.ClosedDateUnix = timeutil.TimeStampNow()
-	}
-
-	if _, err := sess.ID(m.ID).Cols("is_closed", "closed_date_unix").Update(m); err != nil {
 		return err
 	}
 

models/migrations/migrations.go

@@ -256,10 +256,6 @@ var migrations = []Migration{
 	NewMigration("add task table and status column for repository table", addTaskTable),
 	// v100 -> v101
 	NewMigration("update migration repositories' service type", updateMigrationServiceTypes),
-	// v101 -> v102
-	NewMigration("change length of some external login users columns", changeSomeColumnsLengthOfExternalLoginUser),
-	// v102 -> v103
-	NewMigration("update migration repositories' service type", dropColumnHeadUserNameOnPullRequest),
 }
 
 // Migrate database to current version

models/migrations/v101.go

@@ -1,19 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"github.com/go-xorm/xorm"
-)
-
-func changeSomeColumnsLengthOfExternalLoginUser(x *xorm.Engine) error {
-	type ExternalLoginUser struct {
-		AccessToken       string `xorm:"TEXT"`
-		AccessTokenSecret string `xorm:"TEXT"`
-		RefreshToken      string `xorm:"TEXT"`
-	}
-
-	return x.Sync2(new(ExternalLoginUser))
-}

models/migrations/v102.go

@@ -1,15 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package migrations
-
-import (
-	"github.com/go-xorm/xorm"
-)
-
-func dropColumnHeadUserNameOnPullRequest(x *xorm.Engine) error {
-	sess := x.NewSession()
-	defer sess.Close()
-	return dropTableColumns(sess, "pull_request", "head_user_name")
-}

models/models.go

@@ -157,9 +157,11 @@ func SetEngine() (err error) {
 	// so use log file to instead print to stdout.
 	x.SetLogger(NewXORMLogger(setting.Database.LogSQL))
 	x.ShowSQL(setting.Database.LogSQL)
-	x.SetMaxOpenConns(setting.Database.MaxOpenConns)
+	if setting.Database.UseMySQL {
 		x.SetMaxIdleConns(setting.Database.MaxIdleConns)
 		x.SetConnMaxLifetime(setting.Database.ConnMaxLifetime)
+	}
+
 	return nil
 }
 

models/pull.go

@@ -66,6 +66,7 @@ type PullRequest struct {
 	HeadRepo        *Repository `xorm:"-"`
 	BaseRepoID      int64       `xorm:"INDEX"`
 	BaseRepo        *Repository `xorm:"-"`
+	HeadUserName    string
 	HeadBranch      string
 	BaseBranch      string
 	ProtectedBranch *ProtectedBranch `xorm:"-"`
@@ -78,15 +79,6 @@ type PullRequest struct {
 	MergedUnix     timeutil.TimeStamp `xorm:"updated INDEX"`
 }
 
-// MustHeadUserName returns the HeadRepo's username if failed return blank
-func (pr *PullRequest) MustHeadUserName() string {
-	if err := pr.LoadHeadRepo(); err != nil {
-		log.Error("LoadHeadRepo: %v", err)
-		return ""
-	}
-	return pr.HeadRepo.MustOwnerName()
-}
-
 // Note: don't try to get Issue because will end up recursive querying.
 func (pr *PullRequest) loadAttributes(e Engine) (err error) {
 	if pr.HasMerged && pr.Merger == nil {
@@ -110,10 +102,6 @@ func (pr *PullRequest) LoadAttributes() error {
 // LoadBaseRepo loads pull request base repository from database
 func (pr *PullRequest) LoadBaseRepo() error {
 	if pr.BaseRepo == nil {
-		if pr.HeadRepoID == pr.BaseRepoID && pr.HeadRepo != nil {
-			pr.BaseRepo = pr.HeadRepo
-			return nil
-		}
 		var repo Repository
 		if has, err := x.ID(pr.BaseRepoID).Get(&repo); err != nil {
 			return err
@@ -125,24 +113,6 @@ func (pr *PullRequest) LoadBaseRepo() error {
 	return nil
 }
 
-// LoadHeadRepo loads pull request head repository from database
-func (pr *PullRequest) LoadHeadRepo() error {
-	if pr.HeadRepo == nil {
-		if pr.HeadRepoID == pr.BaseRepoID && pr.BaseRepo != nil {
-			pr.HeadRepo = pr.BaseRepo
-			return nil
-		}
-		var repo Repository
-		if has, err := x.ID(pr.HeadRepoID).Get(&repo); err != nil {
-			return err
-		} else if !has {
-			return ErrRepoNotExist{ID: pr.BaseRepoID}
-		}
-		pr.HeadRepo = &repo
-	}
-	return nil
-}
-
 // LoadIssue loads issue information from database
 func (pr *PullRequest) LoadIssue() (err error) {
 	return pr.loadIssue(x)
@@ -182,7 +152,7 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {
 			return ""
 		}
 	}
-	return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.MustHeadUserName(), pr.HeadRepo.Name, pr.BaseBranch)
+	return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)
 }
 
 // GetDefaultSquashMessage returns default message used when squash and merging pull request
@@ -1189,6 +1159,18 @@ func checkForInvalidation(requests PullRequestList, repoID int64, doer *User, br
 	return nil
 }
 
+// ChangeUsernameInPullRequests changes the name of head_user_name
+func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
+	pr := PullRequest{
+		HeadUserName: strings.ToLower(newUserName),
+	}
+	_, err := x.
+		Cols("head_user_name").
+		Where("head_user_name = ?", strings.ToLower(oldUserName)).
+		Update(pr)
+	return err
+}
+
 // checkAndUpdateStatus checks if pull request is possible to leaving checking status,
 // and set to be either conflict or mergeable.
 func (pr *PullRequest) checkAndUpdateStatus() {

models/pull_test.go

@@ -232,6 +232,20 @@ func TestPullRequestList_LoadAttributes(t *testing.T) {
 
 // TODO TestAddTestPullRequestTask
 
+func TestChangeUsernameInPullRequests(t *testing.T) {
+	assert.NoError(t, PrepareTestDatabase())
+	const newUsername = "newusername"
+	assert.NoError(t, ChangeUsernameInPullRequests("user1", newUsername))
+
+	prs := make([]*PullRequest, 0, 10)
+	assert.NoError(t, x.Where("head_user_name = ?", newUsername).Find(&prs))
+	assert.Len(t, prs, 2)
+	for _, pr := range prs {
+		assert.Equal(t, newUsername, pr.HeadUserName)
+	}
+	CheckConsistencyFor(t, &PullRequest{})
+}
+
 func TestPullRequest_IsWorkInProgress(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 

models/release.go

@@ -369,7 +369,7 @@ func SyncReleasesWithTags(repo *Repository, gitRepo *git.Repository) error {
 }
 
 // UpdateReleasesMigrationsByType updates all migrated repositories' releases from gitServiceType to replace originalAuthorID to posterID
-func UpdateReleasesMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, posterID int64) error {
+func UpdateReleasesMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID, posterID int64) error {
 	_, err := x.Table("release").
 		Where("repo_id IN (SELECT id FROM repository WHERE original_service_type = ?)", gitServiceType).
 		And("original_author_id = ?", originalAuthorID).

models/repo.go

@@ -1430,7 +1430,6 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err
 		IsFsckEnabled:                   !opts.IsMirror,
 		CloseIssuesViaCommitInAnyBranch: setting.Repository.DefaultCloseIssuesViaCommitsInAnyBranch,
 		Status:                          opts.Status,
-		IsEmpty:                         !opts.AutoInit,
 	}
 
 	sess := x.NewSession()

models/user.go

@@ -994,6 +994,10 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 		return ErrUserAlreadyExist{newUserName}
 	}
 
+	if err = ChangeUsernameInPullRequests(u.Name, newUserName); err != nil {
+		return fmt.Errorf("ChangeUsernameInPullRequests: %v", err)
+	}
+
 	// Do not fail if directory does not exist
 	if err = os.Rename(UserPath(u.Name), UserPath(newUserName)); err != nil && !os.IsNotExist(err) {
 		return fmt.Errorf("Rename user directory: %v", err)

models/user_heatmap_test.go

@@ -17,7 +17,7 @@ func TestGetUserHeatmapDataByUser(t *testing.T) {
 		CountResult int
 		JSONResult  string
 	}{
-		{2, 1, `[{"timestamp":1571616000,"contributions":1}]`},
+		{2, 1, `[{"timestamp":1540080000,"contributions":1}]`},
 		{3, 0, `[]`},
 	}
 	// Prepare
@@ -41,7 +41,7 @@ func TestGetUserHeatmapDataByUser(t *testing.T) {
 		// Get the heatmap and compare
 		heatmap, err := GetUserHeatmapDataByUser(user)
 		assert.NoError(t, err)
-		assert.Equal(t, len(actions), len(heatmap), "invalid action count: did the test data became too old?")
+		assert.Equal(t, len(actions), len(heatmap))
 		assert.Equal(t, tc.CountResult, len(heatmap))
 
 		//Test JSON rendering

models/webhook.go

@@ -833,8 +833,6 @@ func (t *HookTask) deliver() error {
 
 				return err
 			}
-
-			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 		}
 	case http.MethodGet:
 		u, err := url.Parse(t.URL)

modules/context/org.go

@@ -63,7 +63,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 
 	// Force redirection when username is actually a user.
 	if !org.IsOrganization() {
-		ctx.Redirect(setting.AppSubURL + "/" + org.Name)
+		ctx.Redirect("/" + org.Name)
 		return
 	}
 

modules/context/repo.go

@@ -236,7 +236,7 @@ func RedirectToRepo(ctx *Context, redirectRepoID int64) {
 	if ctx.Req.URL.RawQuery != "" {
 		redirectPath += "?" + ctx.Req.URL.RawQuery
 	}
-	ctx.Redirect(path.Join(setting.AppSubURL, redirectPath))
+	ctx.Redirect(redirectPath)
 }
 
 func repoAssignment(ctx *Context, repo *models.Repository) {
@@ -414,8 +414,8 @@ func RepoAssignment() macaron.Handler {
 			}
 		}
 
-		// Disable everything when the repo is being created
+		// repo is empty and display enable
-		if ctx.Repo.Repository.IsBeingCreated() {
+		if ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsBeingCreated() {
 			ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch
 			return
 		}
@@ -427,12 +427,6 @@ func RepoAssignment() macaron.Handler {
 		}
 		ctx.Repo.GitRepo = gitRepo
 
-		// Stop at this point when the repo is empty.
-		if ctx.Repo.Repository.IsEmpty {
-			ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch
-			return
-		}
-
 		tags, err := ctx.Repo.GitRepo.GetTags()
 		if err != nil {
 			ctx.ServerError("GetTags", err)

modules/migrations/gitea.go

@@ -581,6 +581,7 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
 	var pullRequest = models.PullRequest{
 		HeadRepoID:   g.repo.ID,
 		HeadBranch:   head,
+		HeadUserName: g.repoOwner,
 		BaseRepoID:   g.repo.ID,
 		BaseBranch:   pr.Base.Ref,
 		MergeBase:    pr.Base.SHA,

modules/migrations/update.go

@@ -5,6 +5,8 @@
 package migrations
 
 import (
+	"strconv"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/structs"
@@ -38,7 +40,11 @@ func updateMigrationPosterIDByGitService(tp structs.GitServiceType) error {
 		}
 
 		for _, user := range users {
-			externalUserID := user.ExternalID
+			externalUserID, err := strconv.ParseInt(user.ExternalID, 10, 64)
+			if err != nil {
+				log.Warn("Parse externalUser %#v 's userID failed: %v", user, err)
+				continue
+			}
 			if err := models.UpdateMigrationsByType(tp, externalUserID, user.UserID); err != nil {
 				log.Error("UpdateMigrationsByType type %s external user id %v to local user id %v failed: %v", tp.Name(), user.ExternalID, user.UserID, err)
 			}

modules/password/password.go

@@ -7,60 +7,45 @@ package password
 import (
 	"crypto/rand"
 	"math/big"
-	"strings"
+	"regexp"
 	"sync"
 
 	"code.gitea.io/gitea/modules/setting"
 )
 
-var (
+var matchComplexities = map[string]regexp.Regexp{}
-	matchComplexityOnce sync.Once
+var matchComplexityOnce sync.Once
-	validChars          string
+var validChars string
-	requiredChars       []string
+var validComplexities = map[string]string{
-
+	"lower": "abcdefghijklmnopqrstuvwxyz",
-	charComplexities = map[string]string{
+	"upper": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-		"lower": `abcdefghijklmnopqrstuvwxyz`,
+	"digit": "0123456789",
-		"upper": `ABCDEFGHIJKLMNOPQRSTUVWXYZ`,
+	"spec":  `][ !"#$%&'()*+,./:;<=>?@\^_{|}~` + "`-",
-		"digit": `0123456789`,
+}
-		"spec":  ` !"#$%&'()*+,-./:;<=>?@[\]^_{|}~` + "`",
-	}
-)
 
 // NewComplexity for preparation
 func NewComplexity() {
 	matchComplexityOnce.Do(func() {
-		setupComplexity(setting.PasswordComplexity)
+		if len(setting.PasswordComplexity) > 0 {
+			for key, val := range setting.PasswordComplexity {
+				matchComplexity := regexp.MustCompile(val)
+				matchComplexities[key] = *matchComplexity
+				validChars += validComplexities[key]
+			}
+		} else {
+			for _, val := range validComplexities {
+				validChars += val
+			}
+		}
 	})
 }
 
-func setupComplexity(values []string) {
+// IsComplexEnough return True if password is Complexity
-	if len(values) != 1 || values[0] != "off" {
-		for _, val := range values {
-			if chars, ok := charComplexities[val]; ok {
-				validChars += chars
-				requiredChars = append(requiredChars, chars)
-			}
-		}
-		if len(requiredChars) == 0 {
-			// No valid character classes found; use all classes as default
-			for _, chars := range charComplexities {
-				validChars += chars
-				requiredChars = append(requiredChars, chars)
-			}
-		}
-	}
-	if validChars == "" {
-		// No complexities to check; provide a sensible default for password generation
-		validChars = charComplexities["lower"] + charComplexities["upper"] + charComplexities["digit"]
-	}
-}
-
-// IsComplexEnough return True if password meets complexity settings
 func IsComplexEnough(pwd string) bool {
+	if len(setting.PasswordComplexity) > 0 {
 		NewComplexity()
-	if len(validChars) > 0 {
+		for _, val := range matchComplexities {
-		for _, req := range requiredChars {
+			if !val.MatchString(pwd) {
-			if !strings.ContainsAny(req, pwd) {
 				return false
 			}
 		}

modules/password/password_test.go

@@ -1,75 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package password
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestComplexity_IsComplexEnough(t *testing.T) {
-	matchComplexityOnce.Do(func() {})
-
-	testlist := []struct {
-		complexity  []string
-		truevalues  []string
-		falsevalues []string
-	}{
-		{[]string{"lower"}, []string{"abc", "abc!"}, []string{"ABC", "123", "=!$", ""}},
-		{[]string{"upper"}, []string{"ABC"}, []string{"abc", "123", "=!$", "abc!", ""}},
-		{[]string{"digit"}, []string{"123"}, []string{"abc", "ABC", "=!$", "abc!", ""}},
-		{[]string{"spec"}, []string{"=!$", "abc!"}, []string{"abc", "ABC", "123", ""}},
-		{[]string{"off"}, []string{"abc", "ABC", "123", "=!$", "abc!", ""}, nil},
-		{[]string{"lower", "spec"}, []string{"abc!"}, []string{"abc", "ABC", "123", "=!$", "abcABC123", ""}},
-		{[]string{"lower", "upper", "digit"}, []string{"abcABC123"}, []string{"abc", "ABC", "123", "=!$", "abc!", ""}},
-	}
-
-	for _, test := range testlist {
-		testComplextity(test.complexity)
-		for _, val := range test.truevalues {
-			assert.True(t, IsComplexEnough(val))
-		}
-		for _, val := range test.falsevalues {
-			assert.False(t, IsComplexEnough(val))
-		}
-	}
-
-	// Remove settings for other tests
-	testComplextity([]string{"off"})
-}
-
-func TestComplexity_Generate(t *testing.T) {
-	matchComplexityOnce.Do(func() {})
-
-	const maxCount = 50
-	const pwdLen = 50
-
-	test := func(t *testing.T, modes []string) {
-		testComplextity(modes)
-		for i := 0; i < maxCount; i++ {
-			pwd, err := Generate(pwdLen)
-			assert.NoError(t, err)
-			assert.Equal(t, pwdLen, len(pwd))
-			assert.True(t, IsComplexEnough(pwd), "Failed complexities with modes %+v for generated: %s", modes, pwd)
-		}
-	}
-
-	test(t, []string{"lower"})
-	test(t, []string{"upper"})
-	test(t, []string{"lower", "upper", "spec"})
-	test(t, []string{"off"})
-	test(t, []string{""})
-
-	// Remove settings for other tests
-	testComplextity([]string{"off"})
-}
-
-func testComplextity(values []string) {
-	// Cleanup previous values
-	validChars = ""
-	requiredChars = make([]string, 0, len(values))
-	setupComplexity(values)
-}

modules/repofiles/content.go

@@ -38,9 +38,6 @@ func (ct *ContentType) String() string {
 // GetContentsOrList gets the meta data of a file's contents (*ContentsResponse) if treePath not a tree
 // directory, otherwise a listing of file contents ([]*ContentsResponse). Ref can be a branch, commit or tag
 func GetContentsOrList(repo *models.Repository, treePath, ref string) (interface{}, error) {
-	if repo.IsEmpty {
-		return make([]interface{}, 0), nil
-	}
 	if ref == "" {
 		ref = repo.DefaultBranch
 	}

modules/repofiles/content_test.go

@@ -190,19 +190,3 @@ func TestGetContentsOrListErrors(t *testing.T) {
 		assert.Nil(t, fileContentResponse)
 	})
 }
-
-func TestGetContentsOrListOfEmptyRepos(t *testing.T) {
-	models.PrepareTestEnv(t)
-	ctx := test.MockContext(t, "user2/repo15")
-	ctx.SetParams(":id", "15")
-	test.LoadRepo(t, ctx, 15)
-	test.LoadUser(t, ctx, 2)
-	test.LoadGitRepo(t, ctx)
-	repo := ctx.Repo.Repository
-
-	t.Run("empty repo", func(t *testing.T) {
-		contents, err := GetContentsOrList(repo, "", "")
-		assert.NoError(t, err)
-		assert.Empty(t, contents)
-	})
-}

modules/setting/database.go

@@ -42,11 +42,12 @@ var (
 		DBConnectRetries  int
 		DBConnectBackoff  time.Duration
 		MaxIdleConns      int
-		MaxOpenConns      int
 		ConnMaxLifetime   time.Duration
 		IterateBufferSize int
 	}{
 		Timeout:         500,
+		MaxIdleConns:    0,
+		ConnMaxLifetime: 3 * time.Second,
 	}
 )
 
@@ -79,13 +80,8 @@ func InitDBConfig() {
 	Database.Charset = sec.Key("CHARSET").In("utf8", []string{"utf8", "utf8mb4"})
 	Database.Path = sec.Key("PATH").MustString(filepath.Join(AppDataPath, "gitea.db"))
 	Database.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(500)
-	Database.MaxIdleConns = sec.Key("MAX_IDLE_CONNS").MustInt(2)
+	Database.MaxIdleConns = sec.Key("MAX_IDLE_CONNS").MustInt(0)
-	if Database.UseMySQL {
 	Database.ConnMaxLifetime = sec.Key("CONN_MAX_LIFE_TIME").MustDuration(3 * time.Second)
-	} else {
-		Database.ConnMaxLifetime = sec.Key("CONN_MAX_LIFE_TIME").MustDuration(0)
-	}
-	Database.MaxOpenConns = sec.Key("MAX_OPEN_CONNS").MustInt(0)
 
 	Database.IterateBufferSize = sec.Key("ITERATE_BUFFER_SIZE").MustInt(50)
 	Database.LogSQL = sec.Key("LOG_SQL").MustBool(true)

modules/setting/setting.go

@@ -146,7 +146,7 @@ var (
 	MinPasswordLength     int
 	ImportLocalPaths      bool
 	DisableGitHooks       bool
-	PasswordComplexity    []string
+	PasswordComplexity    map[string]string
 	PasswordHashAlgo      string
 
 	// UI settings
@@ -775,13 +775,25 @@ func NewContext() {
 
 	InternalToken = loadInternalToken(sec)
 
-	cfgdata := sec.Key("PASSWORD_COMPLEXITY").Strings(",")
+	var dictPC = map[string]string{
-	PasswordComplexity = make([]string, 0, len(cfgdata))
+		"lower": "[a-z]+",
-	for _, name := range cfgdata {
+		"upper": "[A-Z]+",
-		name := strings.ToLower(strings.Trim(name, `"`))
+		"digit": "[0-9]+",
-		if name != "" {
+		"spec":  `][ !"#$%&'()*+,./:;<=>?@\\^_{|}~` + "`-",
-			PasswordComplexity = append(PasswordComplexity, name)
 	}
+	PasswordComplexity = make(map[string]string)
+	cfgdata := sec.Key("PASSWORD_COMPLEXITY").Strings(",")
+	for _, y := range cfgdata {
+		ts := strings.TrimSpace(y)
+		for a := range dictPC {
+			if strings.ToLower(ts) == a {
+				PasswordComplexity[ts] = dictPC[ts]
+				break
+			}
+		}
+	}
+	if len(PasswordComplexity) == 0 {
+		PasswordComplexity = dictPC
 	}
 
 	sec = Cfg.Section("attachment")

public/css/index.css

@@ -239,7 +239,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .lines-commit .ui.avatar.image{height:18px;width:18px}
 .lines-code .bottom-line,.lines-commit .bottom-line,.lines-num .bottom-line{border-bottom:1px solid #eaecef}
 .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
-.code-view :not(.fa):not(.octicon):not(.icon){font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
+.code-view *{font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
 .code-view table{width:100%}
 .code-view .active{background:#fff866}
 .markdown:not(code){overflow:hidden;font-size:16px;line-height:1.6!important;word-wrap:break-word}
@@ -659,6 +659,8 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .repository #commits-table td.sha .sha.label.isSigned.isVerified:hover,.repository #repo-files-table .sha.label.isSigned.isVerified:hover{background:rgba(33,186,69,.3)!important}
 .repository .diff-detail-box{padding:7px 0;background:#fff;line-height:30px}
 .repository .diff-detail-box>div:after{clear:both;content:"";display:block}
+.repository .diff-detail-box ol{clear:both;padding-left:0;margin-top:5px;margin-bottom:28px}
+.repository .diff-detail-box ol li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #ddd;padding-left:6px}
 .repository .diff-detail-box span.status{display:inline-block;width:12px;height:12px;margin-right:8px;vertical-align:middle}
 .repository .diff-detail-box span.status.modify{background-color:#f0db88}
 .repository .diff-detail-box span.status.add{background-color:#b4e2b4}
@@ -695,11 +697,6 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .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 .diff-stats{clear:both;margin-bottom:5px;max-height:400px;overflow:auto;padding-left:0}
-.repository .diff-stats li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #ddd;padding-left:6px}
-.repository .diff-stats .diff-counter{margin-right:15px}
-.repository .diff-stats .diff-counter .del{color:red}
-.repository .diff-stats .diff-counter .add{color:green}
 .repository .repo-search-result{padding-top:10px;padding-bottom:10px}
 .repository .repo-search-result .lines-num a{color:inherit}
 .repository.quickstart .guide .item{padding:1em}

public/js/index.js

@@ -306,7 +306,7 @@ function initReactionSelector(parent) {
             if (resp && (resp.html || resp.empty)) {
                 const content = $(vm).closest('.content');
                 let react = content.find('.segment.reactions');
-                if (!resp.empty && react.length > 0) {
+                if (react.length > 0) {
                     react.remove();
                 }
                 if (!resp.empty) {

public/less/_base.less

@@ -1047,7 +1047,7 @@ footer {
     overflow-x: auto;
     overflow-y: hidden;
 
-    *:not(.fa):not(.octicon):not(.icon) {
+    * {
         font-size: 12px;
         font-family: @monospaced-fonts, monospace;
         line-height: 20px;

public/less/_repository.less

@@ -1237,6 +1237,21 @@
             display: block;
         }
 
+        ol {
+            clear: both;
+            padding-left: 0;
+            margin-top: 5px;
+            margin-bottom: 28px;
+
+            li {
+                list-style: none;
+                padding-bottom: 4px;
+                margin-bottom: 4px;
+                border-bottom: 1px dashed #dddddd;
+                padding-left: 6px;
+            }
+        }
+
         span.status {
             display: inline-block;
             width: 12px;
@@ -1451,34 +1466,6 @@
         }
     }
 
-    .diff-stats {
-
-        clear: both;
-        margin-bottom: 5px;
-        max-height: 400px;
-        overflow: auto;
-        padding-left: 0;
-
-        li {
-            list-style: none;
-            padding-bottom: 4px;
-            margin-bottom: 4px;
-            border-bottom: 1px dashed #dddddd;
-            padding-left: 6px;
-        }
-
-        .diff-counter {
-            margin-right: 15px;
-
-            .del {
-                color: red;
-            }
-            .add {
-                color: green;
-            }
-        }
-    }
-
     .repo-search-result {
         padding-top: 10px;
         padding-bottom: 10px;

routers/admin/users_test.go

@@ -34,7 +34,7 @@ func TestNewUserPost_MustChangePassword(t *testing.T) {
 		LoginName:          "local",
 		UserName:           username,
 		Email:              email,
-		Password:           "abc123ABC!=$",
+		Password:           "xxxxxxxx",
 		SendNotify:         false,
 		MustChangePassword: true,
 	}
@@ -71,7 +71,7 @@ func TestNewUserPost_MustChangePasswordFalse(t *testing.T) {
 		LoginName:          "local",
 		UserName:           username,
 		Email:              email,
-		Password:           "abc123ABC!=$",
+		Password:           "xxxxxxxx",
 		SendNotify:         false,
 		MustChangePassword: false,
 	}

routers/api/v1/convert/convert.go

@@ -232,9 +232,12 @@ func ToTeam(team *models.Team) *api.Team {
 // ToUser convert models.User to api.User
 func ToUser(user *models.User, signed, authed bool) *api.User {
 	result := &api.User{
+		ID:        user.ID,
 		UserName:  user.Name,
 		AvatarURL: user.AvatarLink(),
 		FullName:  markup.Sanitize(user.FullName),
+		IsAdmin:   user.IsAdmin,
+		LastLogin: user.LastLoginUnix.AsTime(),
 		Created:   user.CreatedUnix.AsTime(),
 	}
 	// hide primary email if API caller isn't user itself or an admin
@@ -242,11 +245,8 @@ func ToUser(user *models.User, signed, authed bool) *api.User {
 		result.Email = ""
 	} else if user.KeepEmailPrivate && !authed {
 		result.Email = user.GetEmail()
-	} else { // only user himself and admin could visit these information
+	} else {
-		result.ID = user.ID
 		result.Email = user.Email
-		result.IsAdmin = user.IsAdmin
-		result.LastLogin = user.LastLoginUnix.AsTime()
 	}
 	return result
 }

routers/api/v1/repo/issue.go

@@ -312,14 +312,15 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 	}
 
 	// Update the deadline
-	if form.Deadline != nil && ctx.Repo.CanWrite(models.UnitTypeIssues) {
+	var deadlineUnix timeutil.TimeStamp
-		deadlineUnix := timeutil.TimeStamp(form.Deadline.Unix())
+	if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.CanWrite(models.UnitTypeIssues) {
+		deadlineUnix = timeutil.TimeStamp(form.Deadline.Unix())
+	}
+
 	if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
 		ctx.Error(500, "UpdateIssueDeadline", err)
 		return
 	}
-		issue.DeadlineUnix = deadlineUnix
-	}
 
 	// Add/delete assignees
 

routers/api/v1/repo/pull.go

@@ -190,7 +190,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
 	)
 
 	// Get repo/branch information
-	_, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := parseCompareInfo(ctx, form)
+	headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := parseCompareInfo(ctx, form)
 	if ctx.Written() {
 		return
 	}
@@ -267,6 +267,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
 	pr := &models.PullRequest{
 		HeadRepoID:   headRepo.ID,
 		BaseRepoID:   repo.ID,
+		HeadUserName: headUser.Name,
 		HeadBranch:   headBranch,
 		BaseBranch:   baseBranch,
 		HeadRepo:     headRepo,
@@ -368,14 +369,15 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
 	}
 
 	// Update Deadline
-	if form.Deadline != nil {
+	var deadlineUnix timeutil.TimeStamp
-		deadlineUnix := timeutil.TimeStamp(form.Deadline.Unix())
+	if form.Deadline != nil && !form.Deadline.IsZero() {
+		deadlineUnix = timeutil.TimeStamp(form.Deadline.Unix())
+	}
+
 	if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
 		ctx.Error(500, "UpdateIssueDeadline", err)
 		return
 	}
-		issue.DeadlineUnix = deadlineUnix
-	}
 
 	// Add/delete assignees
 

routers/api/v1/user/user.go

@@ -104,7 +104,7 @@ func GetInfo(ctx *context.APIContext) {
 		return
 	}
 
-	ctx.JSON(200, convert.ToUser(u, ctx.IsSigned, ctx.User != nil && (ctx.User.ID == u.ID || ctx.User.IsAdmin)))
+	ctx.JSON(200, convert.ToUser(u, ctx.IsSigned, ctx.User.ID == u.ID || ctx.User.IsAdmin))
 }
 
 // GetAuthenticatedUser get current user's information

routers/home.go

@@ -273,7 +273,7 @@ func ExploreOrganizations(ctx *context.Context) {
 // ExploreCode render explore code page
 func ExploreCode(ctx *context.Context) {
 	if !setting.Indexer.RepoIndexerEnabled {
-		ctx.Redirect(setting.AppSubURL+"/explore", 302)
+		ctx.Redirect("/explore", 302)
 		return
 	}
 

routers/repo/download.go

@@ -84,11 +84,6 @@ func ServeBlobOrLFS(ctx *context.Context, blob *git.Blob) error {
 		if err != nil {
 			return err
 		}
-		defer func() {
-			if err = lfsDataRc.Close(); err != nil {
-				log.Error("ServeBlobOrLFS: Close: %v", err)
-			}
-		}()
 		return ServeData(ctx, ctx.Repo.TreePath, lfsDataRc)
 	}
 

routers/repo/pull.go

@@ -272,12 +272,12 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
 }
 
 func setMergeTarget(ctx *context.Context, pull *models.PullRequest) {
-	if ctx.Repo.Owner.Name == pull.MustHeadUserName() {
+	if ctx.Repo.Owner.Name == pull.HeadUserName {
 		ctx.Data["HeadTarget"] = pull.HeadBranch
 	} else if pull.HeadRepo == nil {
-		ctx.Data["HeadTarget"] = pull.MustHeadUserName() + ":" + pull.HeadBranch
+		ctx.Data["HeadTarget"] = pull.HeadUserName + ":" + pull.HeadBranch
 	} else {
-		ctx.Data["HeadTarget"] = pull.MustHeadUserName() + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
+		ctx.Data["HeadTarget"] = pull.HeadUserName + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
 	}
 	ctx.Data["BaseTarget"] = pull.BaseBranch
 }
@@ -440,7 +440,7 @@ func ViewPullCommits(ctx *context.Context) {
 			ctx.NotFound("ViewPullCommits", nil)
 			return
 		}
-		ctx.Data["Username"] = pull.MustHeadUserName()
+		ctx.Data["Username"] = pull.HeadUserName
 		ctx.Data["Reponame"] = pull.HeadRepo.Name
 		commits = prInfo.Commits
 	}
@@ -512,7 +512,7 @@ func ViewPullFiles(ctx *context.Context) {
 			return
 		}
 
-		headRepoPath := pull.HeadRepo.RepoPath()
+		headRepoPath := models.RepoPath(pull.HeadUserName, pull.HeadRepo.Name)
 
 		headGitRepo, err := git.OpenRepository(headRepoPath)
 		if err != nil {
@@ -531,8 +531,8 @@ func ViewPullFiles(ctx *context.Context) {
 		endCommitID = headCommitID
 		gitRepo = headGitRepo
 
-		headTarget = path.Join(pull.MustHeadUserName(), pull.HeadRepo.Name)
+		headTarget = path.Join(pull.HeadUserName, pull.HeadRepo.Name)
-		ctx.Data["Username"] = pull.MustHeadUserName()
+		ctx.Data["Username"] = pull.HeadUserName
 		ctx.Data["Reponame"] = pull.HeadRepo.Name
 	}
 
@@ -756,6 +756,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm)
 	pullRequest := &models.PullRequest{
 		HeadRepoID:   headRepo.ID,
 		BaseRepoID:   repo.ID,
+		HeadUserName: headUser.Name,
 		HeadBranch:   headBranch,
 		BaseBranch:   baseBranch,
 		HeadRepo:     headRepo,

routers/user/setting/account.go

@@ -28,6 +28,7 @@ func Account(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsAccount"] = true
 	ctx.Data["Email"] = ctx.User.Email
+	ctx.Data["EmailNotificationsPreference"] = ctx.User.EmailNotifications()
 
 	loadAccountData(ctx)
 
@@ -53,7 +54,7 @@ func AccountPost(ctx *context.Context, form auth.ChangePasswordForm) {
 	} else if form.Password != form.Retype {
 		ctx.Flash.Error(ctx.Tr("form.password_not_match"))
 	} else if !password.IsComplexEnough(form.Password) {
-		ctx.Flash.Error(ctx.Tr("form.password_complexity"))
+		ctx.Flash.Error(ctx.Tr("settings.password_complexity"))
 	} else {
 		var err error
 		if ctx.User.Salt, err = models.GetUserSalt(); err != nil {
@@ -229,5 +230,4 @@ func loadAccountData(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Emails"] = emails
-	ctx.Data["EmailNotificationsPreference"] = ctx.User.EmailNotifications()
 }

routers/user/setting/account_test.go

@@ -19,64 +19,76 @@ import (
 func TestChangePassword(t *testing.T) {
 	oldPassword := "password"
 	setting.MinPasswordLength = 6
-	var pcALL = []string{"lower", "upper", "digit", "spec"}
+	setting.PasswordComplexity = map[string]string{
-	var pcLUN = []string{"lower", "upper", "digit"}
+		"lower": "[a-z]+",
-	var pcLU = []string{"lower", "upper"}
+		"upper": "[A-Z]+",
+		"digit": "[0-9]+",
+		"spec":  "[-_]+",
+	}
+	var pcLUN = map[string]string{
+		"lower": "[a-z]+",
+		"upper": "[A-Z]+",
+		"digit": "[0-9]+",
+	}
+	var pcLU = map[string]string{
+		"lower": "[a-z]+",
+		"upper": "[A-Z]+",
+	}
 
 	for _, req := range []struct {
 		OldPassword        string
 		NewPassword        string
 		Retype             string
 		Message            string
-		PasswordComplexity []string
+		PasswordComplexity map[string]string
 	}{
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "Qwerty123456-",
 			Retype:             "Qwerty123456-",
 			Message:            "",
-			PasswordComplexity: pcALL,
+			PasswordComplexity: setting.PasswordComplexity,
 		},
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "12345",
 			Retype:             "12345",
 			Message:            "auth.password_too_short",
-			PasswordComplexity: pcALL,
+			PasswordComplexity: setting.PasswordComplexity,
 		},
 		{
 			OldPassword:        "12334",
 			NewPassword:        "123456",
 			Retype:             "123456",
 			Message:            "settings.password_incorrect",
-			PasswordComplexity: pcALL,
+			PasswordComplexity: setting.PasswordComplexity,
 		},
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "123456",
 			Retype:             "12345",
 			Message:            "form.password_not_match",
-			PasswordComplexity: pcALL,
+			PasswordComplexity: setting.PasswordComplexity,
 		},
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "Qwerty",
 			Retype:             "Qwerty",
-			Message:            "form.password_complexity",
+			Message:            "settings.password_complexity",
-			PasswordComplexity: pcALL,
+			PasswordComplexity: setting.PasswordComplexity,
 		},
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "Qwerty",
 			Retype:             "Qwerty",
-			Message:            "form.password_complexity",
+			Message:            "settings.password_complexity",
 			PasswordComplexity: pcLUN,
 		},
 		{
 			OldPassword:        oldPassword,
 			NewPassword:        "QWERTY",
 			Retype:             "QWERTY",
-			Message:            "form.password_complexity",
+			Message:            "settings.password_complexity",
 			PasswordComplexity: pcLU,
 		},
 	} {

services/externalaccount/user.go

@@ -5,6 +5,7 @@
 package externalaccount
 
 import (
+	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -44,7 +45,10 @@ func LinkAccountToUser(user *models.User, gothUser goth.User) error {
 		return err
 	}
 
-	externalID := externalLoginUser.ExternalID
+	externalID, err := strconv.ParseInt(externalLoginUser.ExternalID, 10, 64)
+	if err != nil {
+		return err
+	}
 
 	var tp structs.GitServiceType
 	for _, s := range structs.SupportedFullGitService {

services/pull/merge.go

@@ -65,7 +65,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 		}
 	}()
 
-	headRepoPath := pr.HeadRepo.RepoPath()
+	headRepoPath := models.RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
 
 	if err := git.InitRepository(tmpBasePath, false); err != nil {
 		return fmt.Errorf("git init: %v", err)
@@ -260,17 +260,14 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 		}
 	}
 
-	var headUser *models.User
+	headUser, err := models.GetUserByName(pr.HeadUserName)
-	err = pr.HeadRepo.GetOwner()
 	if err != nil {
 		if !models.IsErrUserNotExist(err) {
-			log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)
+			log.Error("Can't find user: %s for head repository - %v", pr.HeadUserName, err)
 			return err
 		}
-		log.Error("Can't find user: %d for head repository - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, doer.Name, err)
+		log.Error("Can't find user: %s for head repository - defaulting to doer: %s - %v", pr.HeadUserName, doer.Name, err)
 		headUser = doer
-	} else {
-		headUser = pr.HeadRepo.Owner
 	}
 
 	env := models.FullPushingEnvironment(

templates/repo/diff/box.tmpl

@@ -16,8 +16,8 @@
 	</div>
 	<h4>{{.i18n.Tr "repo.diff.data_not_available"}}</h4>
 {{else}}
-	<div>
 	<div class="diff-detail-box diff-box ui sticky">
+		<div>
 			<i class="fa fa-retweet"></i>
 			{{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
 			<div class="ui right">
@@ -32,17 +32,17 @@
 				{{end}}
 			</div>
 		</div>
-		<ol class="diff-detail-box diff-stats detail-files hide" id="diff-files">
+		<ol class="detail-files hide" id="diff-files">
 			{{range .Diff.Files}}
 				<li>
 					<div class="diff-counter count pull-right">
 						{{if not .IsBin}}
-							<span class="add" data-line="{{.Addition}}">+{{.Addition}}</span>
+							<span class="add" data-line="{{.Addition}}">{{.Addition}}</span>
 							<span class="bar">
 								<div class="pull-left add"></div>
 								<div class="pull-left del"></div>
 							</span>
-							<span class="del" data-line="{{.Deletion}}">-{{.Deletion}}</span>
+							<span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span>
 						{{else}}
 							<span>{{$.i18n.Tr "repo.diff.bin"}}</span>
 						{{end}}
@@ -53,6 +53,8 @@
 				</li>
 			{{end}}
 		</ol>
+	</div>
+
 	{{range $i, $file := .Diff.Files}}
 		{{if $file.IsIncomplete}}
 			<div class="diff-file-box diff-box file-content">
@@ -235,5 +237,4 @@
 			});
 		</script>
 	{{end}}
-	</div>
 {{end}}

templates/user/auth/grant.tmpl

@@ -16,7 +16,7 @@
 				<p>{{.i18n.Tr "auth.authroize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}</p>
 			</div>
 			<div class="ui attached segment">
-				<form method="post" action="{{AppSubUrl}}/login/oauth/grant">
+				<form method="post" action="{{.AppSubUrl}}/login/oauth/grant">
 					{{.CsrfTokenHtml}}
 					<input type="hidden" name="client_id" value="{{.Application.ClientID}}">
 					<input type="hidden" name="state" value="{{.State}}">