diff options
| author | Sandro Santilli <strk@kbt.io> | 2016-11-07 11:41:50 +0100 |
|---|---|---|
| committer | Sandro Santilli <strk@kbt.io> | 2016-11-07 16:05:18 +0100 |
| commit | b7263f31a5a0a4a0ac8fe92c83563d7b7dcf7423 (patch) | |
| tree | 782bbf98af42c4ffb3d8c38dc787911706d1390e /routers | |
| parent | 1b962bac0bb00d6ce2bfd29fdeb1f95301e17b98 (diff) | |
| download | gitea-b7263f31a5a0a4a0ac8fe92c83563d7b7dcf7423.tar.gz gitea-b7263f31a5a0a4a0ac8fe92c83563d7b7dcf7423.zip | |
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
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
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. |