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 master
commit 8643bfeb374be233ed4b734bf082fe2db9499155 2 parents 48fe713 + 31b6adf Mark LaCroix authored on 21 Jan 2015

Showing 27 changed files

• contrib/README.md
• src/main/resources/update/2_8.sql
• src/main/scala/app/AccountController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/service/SystemSettingsService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/util/LDAPUtil.scala
• src/main/scala/view/Markdown.scala
• src/main/scala/view/helpers.scala
• src/main/twirl/account/newrepo.scala.html
• src/main/twirl/admin/system.scala.html
• src/main/twirl/dashboard/issueslist.scala.html
• src/main/twirl/dashboard/pulls.scala.html
• src/main/twirl/dashboard/pullslist.scala.html
• src/main/twirl/helper/diff.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/pulls/mergeguide.scala.html
• src/main/twirl/repo/commentform.scala.html
• src/main/twirl/signin.scala.html
• src/main/twirl/wiki/page.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/favicon.png
• src/main/webapp/assets/common/images/gitbucket.png
• src/main/webapp/assets/vendors/jsdifflib/diffview.js
• src/test/scala/view/AvatarImageProviderSpec.scala

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