Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Add missing patch conflit pattern

Browse source
This commit is contained in:
Unknwon 2016-02-03 12:28:03 -05:00
parent 995487e822
commit a47baa1b7a
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.8.27 ##### Current version: 0.8.28
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.8.27.0202" const APP_VER = "0.8.28.0203"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

1
models/pull.go
View file

@ -256,6 +256,7 @@ var patchConflicts = []string{
"patch does not apply", "patch does not apply",
"already exists in working directory", "already exists in working directory",
"unrecognized input", "unrecognized input",
"error:",
} }
// testPatch checks if patch can be merged to base repository without conflit. // testPatch checks if patch can be merged to base repository without conflit.

2
templates/.VERSION
View file

@ -1 +1 @@
0.8.27.0202 0.8.28.0203