diff options
| author | Michael Li <alimy@gility.net> | 2020-02-17 22:48:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 22:48:24 +0800 |
| commit | 4d83fd4238e177d9327c760a5386bc53f25dedbb (patch) | |
| tree | 4c730773e80d0110a449392513b88d70cf1e85fe /internal/db/pull.go | |
| parent | fd14ad6ce9bfe14e2a551845f27058ecf3853d74 (diff) | |
Use go-bindata to embed `public` and `templates` files into binary (#5920)
* fixed private repositories are hidden in the organization's view
* use go-bindata integrate public and templates files to gogs binary
* optimize Dockerfile don't COPY public and templates files
* use kevinburke's go-bindata to generate assets code
* reset develepment as default run mode in configure file
* optimize generated assets code relayout and help function
* fixed code format
* Update conf/app.ini
* assets: add LICENSE headers
* Some housekeeping
* assets/public: simplify code logic
* assets/templates: simplify code logic
* cmd/web: more concise variable names
* Minor changes
* Add custom public and templates support back
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Diffstat (limited to 'internal/db/pull.go')
| -rw-r--r-- | internal/db/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/db/pull.go b/internal/db/pull.go index 30179eb2..ccc46231 100644 --- a/internal/db/pull.go +++ b/internal/db/pull.go @@ -19,6 +19,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/osutil" "gogs.io/gogs/internal/process" "gogs.io/gogs/internal/setting" "gogs.io/gogs/internal/sync" @@ -406,7 +407,7 @@ func (pr *PullRequest) testPatch() (err error) { } // Fast fail if patch does not exist, this assumes data is cruppted. - if !com.IsFile(patchPath) { + if !osutil.IsFile(patchPath) { log.Trace("PullRequest[%d].testPatch: ignored cruppted data", pr.ID) return nil } |