diff options
| author | zeripath <art27@cantab.net> | 2019-05-17 13:41:01 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-17 15:41:01 +0300 |
| commit | 96b412bb875f534e37b9af3d9e71842a2dadb6e0 (patch) | |
| tree | 8b951ed9a9b4800399992e90f9db53c74c0b4bbf /models/helper_environment.go | |
| parent | 04f996f1f977fe00cc5ef55ac0548827221f9226 (diff) | |
| download | gitea-96b412bb875f534e37b9af3d9e71842a2dadb6e0.tar.gz gitea-96b412bb875f534e37b9af3d9e71842a2dadb6e0.zip | |
Stop running hooks on pr merge (#6963)
* Stop running hooks on pr merge
* Remove SSH_ORIGINAL_COMMAND from the pushing environment
Diffstat (limited to 'models/helper_environment.go')
| -rw-r--r-- | models/helper_environment.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/models/helper_environment.go b/models/helper_environment.go index 283584cc52..737a9a68c3 100644 --- a/models/helper_environment.go +++ b/models/helper_environment.go @@ -19,6 +19,8 @@ func PushingEnvironment(doer *User, repo *Repository) []string { sig := doer.NewGitSig() + // We should add "SSH_ORIGINAL_COMMAND=gitea-internal", + // once we have hook and pushing infrastructure working correctly return append(os.Environ(), "GIT_AUTHOR_NAME="+sig.Name, "GIT_AUTHOR_EMAIL="+sig.Email, @@ -30,7 +32,6 @@ func PushingEnvironment(doer *User, repo *Repository) []string { EnvPusherName+"="+doer.Name, EnvPusherID+"="+fmt.Sprintf("%d", doer.ID), ProtectedBranchRepoID+"="+fmt.Sprintf("%d", repo.ID), - "SSH_ORIGINAL_COMMAND=gitea-internal", ) } |