mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-03 08:02:36 +09:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbe6aa349f | ||
|
|
4fd55d8796 | ||
|
|
daaabaa1d9 | ||
|
|
fa059debca | ||
|
|
2854c8aa47 | ||
|
|
506c98df5b |
6
Makefile
6
Makefile
@@ -112,7 +112,7 @@ release-windows:
|
|||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
go get -u github.com/karalabe/xgo; \
|
go get -u github.com/karalabe/xgo; \
|
||||||
fi
|
fi
|
||||||
xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
|
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
|
||||||
ifeq ($(CI),drone)
|
ifeq ($(CI),drone)
|
||||||
mv /build/* $(DIST)/binaries
|
mv /build/* $(DIST)/binaries
|
||||||
endif
|
endif
|
||||||
@@ -122,7 +122,7 @@ release-linux:
|
|||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
go get -u github.com/karalabe/xgo; \
|
go get -u github.com/karalabe/xgo; \
|
||||||
fi
|
fi
|
||||||
xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) .
|
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) .
|
||||||
ifeq ($(CI),drone)
|
ifeq ($(CI),drone)
|
||||||
mv /build/* $(DIST)/binaries
|
mv /build/* $(DIST)/binaries
|
||||||
endif
|
endif
|
||||||
@@ -132,7 +132,7 @@ release-darwin:
|
|||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
go get -u github.com/karalabe/xgo; \
|
go get -u github.com/karalabe/xgo; \
|
||||||
fi
|
fi
|
||||||
xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
|
xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) .
|
||||||
ifeq ($(CI),drone)
|
ifeq ($(CI),drone)
|
||||||
mv /build/* $(DIST)/binaries
|
mv /build/* $(DIST)/binaries
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
|
|||||||
|
|
||||||
issue, err := GetIssueByRef(ref)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if IsErrIssueNotExist(err) {
|
if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
@@ -398,7 +398,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
|
|||||||
|
|
||||||
issue, err := GetIssueByRef(ref)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if IsErrIssueNotExist(err) {
|
if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
@@ -438,7 +438,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
|
|||||||
|
|
||||||
issue, err := GetIssueByRef(ref)
|
issue, err := GetIssueByRef(ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if IsErrIssueNotExist(err) {
|
if IsErrIssueNotExist(err) || err == errMissingIssueNumber {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ func RemoveAccountLink(user *User, loginSourceID int64) (int64, error) {
|
|||||||
return deleted, err
|
return deleted, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveAllAccountLinks will remove all external login sources for the given user
|
// removeAllAccountLinks will remove all external login sources for the given user
|
||||||
func RemoveAllAccountLinks(user *User) error {
|
func removeAllAccountLinks(e Engine, user *User) error {
|
||||||
_, err := x.Delete(&ExternalLoginUser{UserID: user.ID})
|
_, err := e.Delete(&ExternalLoginUser{UserID: user.ID})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -635,7 +635,12 @@ func UserSignIn(username, password string) (*User, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
user = &User{LowerName: strings.ToLower(strings.TrimSpace(username))}
|
trimmedUsername := strings.TrimSpace(username)
|
||||||
|
if len(trimmedUsername) == 0 {
|
||||||
|
return nil, ErrUserNotExist{0, username, 0}
|
||||||
|
}
|
||||||
|
|
||||||
|
user = &User{LowerName: strings.ToLower(trimmedUsername)}
|
||||||
}
|
}
|
||||||
|
|
||||||
hasUser, err := x.Get(user)
|
hasUser, err := x.Get(user)
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ func useNewNameAvatars(x *xorm.Engine) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type User struct {
|
type User struct {
|
||||||
|
ID int64 `xorm:"pk autoincr"`
|
||||||
Avatar string
|
Avatar string
|
||||||
UseCustomAvatar bool
|
UseCustomAvatar bool
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -989,7 +989,7 @@ func deleteUser(e *xorm.Session, u *User) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ***** START: ExternalLoginUser *****
|
// ***** START: ExternalLoginUser *****
|
||||||
if err = RemoveAllAccountLinks(u); err != nil {
|
if err = removeAllAccountLinks(e, u); err != nil {
|
||||||
return fmt.Errorf("ExternalLoginUser: %v", err)
|
return fmt.Errorf("ExternalLoginUser: %v", err)
|
||||||
}
|
}
|
||||||
// ***** END: ExternalLoginUser *****
|
// ***** END: ExternalLoginUser *****
|
||||||
|
|||||||
Reference in New Issue
Block a user