Merge remote-tracking branch 'upstream/master' into anon-access

Fork: 0

Gatewify / GitBucket

Browse code Merge remote-tracking branch 'upstream/master' into anon-access Conflicts: src/main/scala/app/SystemSettingsController.scala src/main/scala/service/SystemSettingsService.scala src/test/scala/view/AvatarImageProviderSpec.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 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.14 3.13 3.12 3.11 3.10_h2-1.4.180 3.10.1_h2-1.4.180 3.10.1 3.10 3.1.1 3.1 3.0 2.8 1.0.0
commit 8643bfeb374be233ed4b734bf082fe2db9499155 2 parents 48fe713 + 31b6adf Mark LaCroix authored on 21 Jan 2015

Browse code

Conflicts:
	src/main/scala/app/SystemSettingsController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/test/scala/view/AvatarImageProviderSpec.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 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.14 3.13 3.12 3.11 3.10_h2-1.4.180 3.10.1_h2-1.4.180 3.10.1 3.10 3.1.1 3.1 3.0 2.8 1.0.0

commit 8643bfeb374be233ed4b734bf082fe2db9499155

2 parents 48fe713 + 31b6adf

Mark LaCroix authored on 21 Jan 2015

Patch

Unified Split

Showing 27 changed files

Ignore Space Show notes View contrib/README.md

Ignore Space Show notes View src/main/resources/update/2_8.sql 0 → 100644

Ignore Space Show notes View src/main/scala/app/AccountController.scala

Ignore Space Show notes View src/main/scala/app/RepositoryViewerController.scala

Ignore Space Show notes View src/main/scala/app/SystemSettingsController.scala

Ignore Space Show notes View src/main/scala/service/RepositoryService.scala

Ignore Space Show notes View src/main/scala/service/SystemSettingsService.scala

Ignore Space Show notes View src/main/scala/servlet/AutoUpdateListener.scala

Ignore Space Show notes View src/main/scala/util/LDAPUtil.scala

Ignore Space Show notes View src/main/scala/view/Markdown.scala

Ignore Space Show notes View src/main/scala/view/helpers.scala

Ignore Space Show notes View src/main/twirl/account/newrepo.scala.html

Ignore Space Show notes View src/main/twirl/admin/system.scala.html

Ignore Space Show notes View src/main/twirl/dashboard/issueslist.scala.html

Ignore Space Show notes View src/main/twirl/dashboard/pulls.scala.html

Show notes View src/main/twirl/dashboard/pullslist.scala.html 100644 → 0

Ignore Space Show notes View src/main/twirl/helper/diff.scala.html

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

Ignore Space Show notes View src/main/twirl/pulls/mergeguide.scala.html

Ignore Space Show notes View src/main/twirl/repo/commentform.scala.html

Ignore Space Show notes View src/main/twirl/signin.scala.html

Ignore Space Show notes View src/main/twirl/wiki/page.scala.html

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View src/main/webapp/assets/common/images/favicon.png

Ignore Space Show notes View src/main/webapp/assets/common/images/gitbucket.png

Ignore Space Show notes View src/main/webapp/assets/vendors/jsdifflib/diffview.js

Ignore Space Show notes View src/test/scala/view/AvatarImageProviderSpec.scala

Show line notes below