Merge branch 'master'

Fork: 0

Gatewify / GitBucket

Browse code Merge branch 'master' Conflicts: src/main/scala/gitbucket/core/servlet/AutoUpdate.scala patch-3 test 4.9 4.8 4.7.1 4.7 4.6 4.5 4.4 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.3 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.2.1 4.2 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 4.13 4.12.1 4.12 4.11 4.10 4.1 4.0 1.0.0
commit 3d1c9bc9def94def53e16a0b81cbbfe16b1f3a5a 2 parents 5a5bf34 + 9874eb7 Naoki Takezoe authored on 24 Jan 2016

Browse code

Conflicts:
	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

patch-3 test 4.9 4.8 4.7.1 4.7 4.6 4.5 4.4 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.3 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.2.1 4.2 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 4.13 4.12.1 4.12 4.11 4.10 4.1 4.0 1.0.0

commit 3d1c9bc9def94def53e16a0b81cbbfe16b1f3a5a

2 parents 5a5bf34 + 9874eb7

Naoki Takezoe authored on 24 Jan 2016

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View doc/auto_update.md

Ignore Space Show notes View doc/directory.md

Ignore Space Show notes View doc/release.md

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

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/labels/list.scala.html

Show line notes below