Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop deprecated GOGS_WORK_DIR use #2946

Merged
merged 2 commits into from
Nov 21, 2017
Merged

Drop deprecated GOGS_WORK_DIR use #2946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d34072
Drop deprecated GOGS_WORK_DIR use
cez81 Oct 23, 2017
b3507f3
Merge branch 'master' into drop_gogs_work_dir
lunny Nov 21, 2017
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
4 changes: 0 additions & 4 deletions modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,9 @@ func getAppPath() (string, error) {
func getWorkPath(appPath string) string {
workPath := ""
giteaWorkPath := os.Getenv("GITEA_WORK_DIR")
gogsWorkPath := os.Getenv("GOGS_WORK_DIR")

if len(giteaWorkPath) > 0 {
workPath = giteaWorkPath
} else if len(gogsWorkPath) > 0 {
log.Warn(`Usage of GOGS_WORK_DIR is deprecated and will be *removed* in a future release, please consider changing to GITEA_WORK_DIR`)
workPath = gogsWorkPath
} else {
i := strings.LastIndex(appPath, "/")
if i == -1 {
Expand Down