diff options
| author | Unknwon <u@gogs.io> | 2018-06-17 22:18:41 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2018-06-17 22:18:41 +0800 |
| commit | 376a629c9f99893f341e76163e9b61273dd32c28 (patch) | |
| tree | 4e3e1320c19d73c2282ff82c8d6aafb569ed9d87 /cmd | |
| parent | 303fa37b608a4925f5a0137c89e20a906b3d9fdb (diff) | |
repo: add changes to repository avatar feature (#5221)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/backup.go | 2 | ||||
| -rw-r--r-- | cmd/restore.go | 2 | ||||
| -rw-r--r-- | cmd/web.go | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmd/backup.go b/cmd/backup.go index ad635a4d..0adde979 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -100,7 +100,7 @@ func runBackup(c *cli.Context) error { // Data files if !c.Bool("database-only") { - for _, dir := range []string{"attachments", "avatars"} { + for _, dir := range []string{"attachments", "avatars", "repo-avatars"} { dirPath := path.Join(setting.AppDataPath, dir) if !com.IsDir(dirPath) { continue diff --git a/cmd/restore.go b/cmd/restore.go index 9591b044..70ce948e 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -115,7 +115,7 @@ func runRestore(c *cli.Context) error { // Data files if !c.Bool("database-only") { os.MkdirAll(setting.AppDataPath, os.ModePerm) - for _, dir := range []string{"attachments", "avatars"} { + for _, dir := range []string{"attachments", "avatars", "repo-avatars"} { // Skip if backup archive does not have corresponding data srcPath := path.Join(archivePath, "data", dir) if !com.IsDir(srcPath) { @@ -64,7 +64,7 @@ func checkVersion() { if err != nil { log.Fatal(2, "Fail to read 'templates/.VERSION': %v", err) } - tplVer := string(data) + tplVer := strings.TrimSpace(string(data)) if tplVer != setting.AppVer { if version.Compare(tplVer, setting.AppVer, ">") { log.Fatal(2, "Binary version is lower than template file version, did you forget to recompile Gogs?") @@ -96,14 +96,14 @@ func newMacaron() *macaron.Macaron { m.Use(macaron.Static( setting.AvatarUploadPath, macaron.StaticOptions{ - Prefix: "avatars", + Prefix: models.USER_AVATAR_URL_PREFIX, SkipLogging: setting.DisableRouterLog, }, )) m.Use(macaron.Static( setting.RepositoryAvatarUploadPath, macaron.StaticOptions{ - Prefix: "repo-avatars", + Prefix: models.REPO_AVATAR_URL_PREFIX, SkipLogging: setting.DisableRouterLog, }, )) |