From 930d1759aea9777767fcaf025f25076420c137c6 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 6 May 2017 21:21:22 +0800
Subject: [PATCH] Remove env user salt since no need to use (#1515)
* remove env user salt since no need to use
* remove unused variable from update.go
---
cmd/serv.go | 2 --
models/update.go | 1 -
routers/repo/http.go | 1 -
3 files changed, 4 deletions(-)
diff --git a/cmd/serv.go b/cmd/serv.go
index f7d025c68..def19fc55 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -164,8 +164,6 @@ func runServ(c *cli.Context) error {
fail("Internal error", "Failed to get repository owner (%s): %v", username, err)
}
- os.Setenv(models.EnvRepoUserSalt, repoUser.Salt)
-
repo, err := models.GetRepositoryByName(repoUser.ID, reponame)
if err != nil {
if models.IsErrRepoNotExist(err) {
diff --git a/models/update.go b/models/update.go
index 7ee00f2c2..cd22189f6 100644
--- a/models/update.go
+++ b/models/update.go
@@ -19,7 +19,6 @@ import (
const (
EnvRepoName = "GITEA_REPO_NAME"
EnvRepoUsername = "GITEA_REPO_USER_NAME"
- EnvRepoUserSalt = "GITEA_REPO_USER_SALT"
EnvRepoIsWiki = "GITEA_REPO_IS_WIKI"
EnvPusherName = "GITEA_PUSHER_NAME"
EnvPusherID = "GITEA_PUSHER_ID"
diff --git a/routers/repo/http.go b/routers/repo/http.go
index 9c2ec4d02..82c07b9d8 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -207,7 +207,6 @@ func HTTP(ctx *context.Context) {
environ = []string{
models.EnvRepoUsername + "=" + username,
models.EnvRepoName + "=" + reponame,
- models.EnvRepoUserSalt + "=" + repoUser.Salt,
models.EnvPusherName + "=" + authUser.Name,
models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID),
models.ProtectedBranchRepoID + fmt.Sprintf("=%d", repo.ID),