(refs #1618)Check conflict on the online editor in validation

Fork: 0

Gatewify / GitBucket

Browse code (refs #1618)Check conflict on the online editor in validation patch-3 test 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 4.23.1 4.23.0 4.22.0 4.21.2 4.21.1 4.21.0 4.20.0 4.19.3 4.19.2 4.19.1 4.19.0 4.18.0 4.17.0 4.16.0 4.15.0 4.14.1 4.14 1.0.0
1 parent 5722814 commit a0a7c7f4280365839d6cc9e2408400cfc78b3041 Naoki Takezoe authored on 29 Jun 2017

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/blob.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/delete.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/editor.scala.html

Show line notes below