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
2025-11-10 23:45:50 +01:00 · 2015-01-21 15:49:42 -05:00
parent 48fe7133f7 31b6adf0e5
commit 8643bfeb37
27 changed files with 170 additions and 155 deletions
--- a/src/test/scala/view/AvatarImageProviderSpec.scala
+++ b/src/test/scala/view/AvatarImageProviderSpec.scala
@@ -96,6 +96,7 @@ class AvatarImageProviderSpec extends Specification with Mockito {
      information              = None,
      allowAccountRegistration = false,
      allowAnonymousAccess     = true,
+      isCreateRepoOptionPublic = true,
      gravatar                 = useGravatar,
      notification             = false,
      ssh                      = false,