Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions models/db/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ var (

// AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-)
AlphaDashDotPattern = regexp.MustCompile(`[^\w-\.]`)

// AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-)
AlphaDashDotPipePattern = regexp.MustCompile(`[^\w-\.\|]`)
)

// ErrNameReserved represents a "reserved name" error.
Expand Down
3 changes: 3 additions & 0 deletions models/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@ func (u *User) GitName() string {

// ShortName ellipses username to length
func (u *User) ShortName(length int) string {
if setting.UI.DefaultShowFullName && len(u.FullName) > 0 {
return base.EllipsisString(u.FullName, length)
}
return base.EllipsisString(u.Name, length)
}

Expand Down