From b7263f31a5a0a4a0ac8fe92c83563d7b7dcf7423 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 7 Nov 2016 11:41:50 +0100 Subject: Replace GOGS with GITEA in variable names Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables as a fallback if the equivalent GITEA_* are not set, warning user about the need for change. Does not change "gogs" to "gitea" in webhook type name Because "gogs" hook type is part of the API (routes) and used in templates... Closes #87 --- routers/repo/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routers') diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 50cd77f3fb..0fdffad2db 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -687,7 +687,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) HeadRepo: headRepo, BaseRepo: repo, MergeBase: prInfo.MergeBase, - Type: models.PULL_REQUEST_GOGS, + Type: models.PULL_REQUEST_GITEA, } // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. -- cgit v1.2.3