Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth

README.md

@@ -35,6 +35,8 @@ Installation
 2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
 3. Access **http://[hostname]:[port]/gitbucket/** using your web browser.
 
+If you are using Gitbucket behind a webserver please make sure you have increased the **client_max_body_size** (on nignx)
+
 The default administrator account is **root** and password is **root**.
 
 or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
@@ -58,6 +60,16 @@ Run the following commands in `Terminal` to
 
 Release Notes
 --------
+### 1.12 - 29 Mar 2014
+- SSH repository access is available
+- Allow users can create and management their groups
+- Git submodule support
+- Close issues via commit messages
+- Show repository description below the name on repository page
+- Fix presentation of the source viewer
+- Upgrade to sbt 0.13
+- Fix some bugs
+
 ### 1.11.1 - 06 Mar 2014
 - Bug fix
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.1

project/build.scala

@@ -30,7 +30,7 @@ object MyBuild extends Build {
         "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
         "org.scalatra" %% "scalatra-json" % ScalatraVersion,
         "org.json4s" %% "json4s-jackson" % "3.2.5",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.11",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
         "commons-io" % "commons-io" % "2.4",
         "org.pegdown" % "pegdown" % "1.4.1",
         "org.apache.commons" % "commons-compress" % "1.5",

project/plugins.sbt

@@ -1,9 +1,11 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
-addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.0")
+addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")
 
-addSbtPlugin("io.spray" % "sbt-twirl" % "0.6.1")
+resolvers += "spray repo" at "http://repo.spray.io"
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.2")
+addSbtPlugin("io.spray" % "sbt-twirl" % "0.7.0")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.4")

sbt.bat

@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.12.3.jar" %*
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.1.jar" %*

sbt.sh

@@ -1 +1 @@
-java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.12.3.jar "$@"
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.1.jar "$@"

src/main/scala/app/AccountController.scala

@@ -132,7 +132,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      account.html.edit(x, loadSystemSettings(), flash.get("info"))
+      account.html.edit(x, flash.get("info"))
     } getOrElse NotFound
   })
 
@@ -176,7 +176,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   get("/:userName/_ssh")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { x =>
-      account.html.ssh(x, loadSystemSettings(), getPublicKeys(x.userName))
+      account.html.ssh(x, getPublicKeys(x.userName))
     } getOrElse NotFound
   })
 
@@ -194,7 +194,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   })
 
   get("/register"){
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
       if(context.loginAccount.isDefined){
         redirect("/")
       } else {
@@ -204,7 +204,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   }
 
   post("/register", newForm){ form =>
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
       createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")

src/main/scala/app/ControllerBase.scala

@@ -36,18 +36,16 @@ abstract class ControllerBase extends ScalatraFilter
 
     if(path.startsWith("/console/")){
       val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
       if(account == null){
         // Redirect to login form
-        // TODO Should use the configured base url.
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
-        httpResponse.sendRedirect(context + "/signin?" + StringUtil.urlEncode(path))
       } else if(account.isAdmin){
         // H2 Console (administrators only)
-        // TODO Should use the configured base url.
         chain.doFilter(request, response)
       } else {
         // Redirect to dashboard
-        // TODO Should use the configured base url.
+        httpResponse.sendRedirect(baseUrl + "/")
-        httpResponse.sendRedirect(context + "/")
       }
     } else if(path.startsWith("/git/")){
       // Git repository
@@ -68,7 +66,7 @@ abstract class ControllerBase extends ScalatraFilter
   implicit def context: Context = {
     contextCache.get match {
       case null => {
-        val context = Context(loadSystemSettings().baseUrl.getOrElse(servletContext.getContextPath), LoginAccount, request)
+        val context = Context(loadSystemSettings(), LoginAccount, request)
         contextCache.set(context)
         context
       }
@@ -138,10 +136,10 @@ abstract class ControllerBase extends ScalatraFilter
 
 /**
  * Context object for the current request.
- *
- * @param path the context path
  */
-case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){
+case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+
+  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
 
   lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
 

src/main/scala/app/IndexController.scala

@@ -22,7 +22,6 @@ trait IndexControllerBase extends ControllerBase {
 
     html.index(getRecentActivities(),
       getVisibleRepositories(loginAccount, baseUrl),
-      loadSystemSettings(),
       loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
     )
   }
@@ -32,11 +31,11 @@ trait IndexControllerBase extends ControllerBase {
     if(redirect.isDefined && redirect.get.startsWith("/")){
       flash += Keys.Flash.Redirect -> redirect.get
     }
-    html.signin(loadSystemSettings())
+    html.signin()
   }
 
   post("/signin", form){ form =>
-    authenticate(loadSystemSettings(), form.userName, form.password) match {
+    authenticate(context.settings, form.userName, form.password) match {
       case Some(account) => signin(account)
       case None          => redirect("/signin")
     }

src/main/scala/app/RepositoryViewerController.scala

@@ -65,7 +65,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
               view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-            }, page, hasNext, loadSystemSettings())
+            }, page, hasNext)
         case Left(_) => NotFound
       }
     }
@@ -118,7 +118,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             JGitUtil.ContentInfo(viewer, None)
           }
 
-          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit), loadSystemSettings())
+          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
         }
       } getOrElse NotFound
     }
@@ -136,7 +136,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
             JGitUtil.getBranchesOfCommit(git, revCommit.getName),
             JGitUtil.getTagsOfCommit(git, revCommit.getName),
-            repository, diffs, oldCommitId, loadSystemSettings())
+            repository, diffs, oldCommitId)
         }
       }
     }
@@ -152,8 +152,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
         (branchName, revCommit.getCommitterIdent.getWhen)
       }
-      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount),
+      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
-        repository, loadSystemSettings())
     }
   })
 
@@ -176,14 +175,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Displays tags.
    */
   get("/:owner/:repository/tags")(referrersOnly {
-    repo.html.tags(_, loadSystemSettings())
+    repo.html.tags(_)
   })
 
   /**
    * Download repository contents as an archive.
    */
-  get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
+  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
-    val name = params("name")
+    val name = multiParams("splat").head
 
     if(name.endsWith(".zip")){
       val revision = name.replaceFirst("\\.zip$", "")
@@ -194,7 +193,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       workDir.mkdirs
 
       val zipFile = new File(workDir, repository.name + "-" +
-        (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
+        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
 
       using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
@@ -209,7 +208,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             while(walk.next){
               val name = walk.getPathString
               val mode = walk.getFileMode(0)
-              if(mode == FileMode.REGULAR_FILE){
+              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
                 walk.getObjectId(objectId, 0)
                 val entry = new ZipEntry(name)
                 val loader = reader.open(objectId)
@@ -285,7 +284,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             repo.html.files(revision, repository,
               if(path == ".") Nil else path.split("/").toList, // current path
               new JGitUtil.CommitInfo(revCommit), // latest commit
-              files, readme, loadSystemSettings())
+              files, readme)
           }
         } getOrElse NotFound
       }

src/main/scala/app/SystemSettingsController.scala

@@ -7,10 +7,10 @@ import jp.sf.amateras.scalatra.forms._
 import ssh.SshServer
 
 class SystemSettingsController extends SystemSettingsControllerBase
-  with SystemSettingsService with AccountService with AdminAuthenticator
+  with AccountService with AdminAuthenticator
 
 trait SystemSettingsControllerBase extends ControllerBase {
-  self: SystemSettingsService with AccountService with AdminAuthenticator =>
+  self: AccountService with AdminAuthenticator =>
 
   private val form = mapping(
     "baseUrl"                  -> trim(label("Base URL", optional(text()))),
@@ -50,7 +50,7 @@ trait SystemSettingsControllerBase extends ControllerBase {
 
 
   get("/admin/system")(adminOnly {
-    admin.html.system(loadSystemSettings(), flash.get("info"))
+    admin.html.system(flash.get("info"))
   })
 
   post("/admin/system", form)(adminOnly { form =>

src/main/scala/app/WikiController.scala

@@ -36,7 +36,7 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
     getWikiPage(repository.owner, repository.name, "Home").map { page =>
-      wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
   
@@ -44,7 +44,7 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = StringUtil.urlDecode(params("page"))
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
     } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
   
@@ -53,7 +53,7 @@ trait WikiControllerBase extends ControllerBase {
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
-        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository, loadSystemSettings())
+        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
         case Left(_) => NotFound
       }
     }
@@ -65,7 +65,7 @@ trait WikiControllerBase extends ControllerBase {
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
-        hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings(), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
   
@@ -74,7 +74,7 @@ trait WikiControllerBase extends ControllerBase {
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       wiki.html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
-        hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings(), flash.get("info"))
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
 
@@ -103,7 +103,7 @@ trait WikiControllerBase extends ControllerBase {
 
   get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
-    wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository, loadSystemSettings())
+    wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
@@ -118,7 +118,7 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
-    wiki.html.edit("", None, _, loadSystemSettings())
+    wiki.html.edit("", None, _)
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
@@ -146,13 +146,13 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
     wiki.html.pages(getWikiPageList(repository.owner, repository.name), repository,
-      hasWritePermission(repository.owner, repository.name, context.loginAccount), loadSystemSettings())
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
   })
   
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master") match {
-        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository, loadSystemSettings())
+        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
         case Left(_) => NotFound
       }
     }

src/main/scala/service/RepositorySearchService.scala

@@ -63,7 +63,8 @@ RepositorySearchService { self: IssuesService =>
     val list = new ListBuffer[(String, String)]
 
     while (treeWalk.next()) {
-      if(treeWalk.getFileMode(0) == FileMode.REGULAR_FILE){
+      val mode = treeWalk.getFileMode(0)
+      if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
         JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).foreach { bytes =>
           if(FileUtil.isText(bytes)){
             val text      = StringUtil.convertFromByteArray(bytes)

src/main/scala/service/RepositoryService.scala

@@ -294,7 +294,7 @@ object RepositoryService {
 
     lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
 
-    def sshUrl(port: Int) = s"ssh://${host}:${port}/${owner}/${name}.git"
+    def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"
 
     /**
      * Creates instance with issue count and pull request count.

src/main/scala/service/RequestCache.scala

@@ -1,7 +1,6 @@
 package service
 
 import model._
-import service.SystemSettingsService.SystemSettings
 
 /**
  * This service is used for a view helper mainly.
@@ -9,28 +8,23 @@ import service.SystemSettingsService.SystemSettings
  * It may be called many times in one request, so each method stores
  * its result into the cache which available during a request.
  */
-trait RequestCache {
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
-
-  def getSystemSettings()(implicit context: app.Context): SystemSettings =
-    context.cache("system_settings"){
-      new SystemSettingsService {}.loadSystemSettings()
-    }
 
   def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
     context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
-      new IssuesService {}.getIssue(userName, repositoryName, issueId)
+      super.getIssue(userName, repositoryName, issueId)
     }
   }
 
   def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
+      super.getAccountByUserName(userName)
     }
   }
 
   def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${mailAddress}"){
-      new AccountService {}.getAccountByMailAddress(mailAddress)
+      super.getAccountByMailAddress(mailAddress)
     }
   }
 }

src/main/scala/service/WikiService.scala

@@ -43,8 +43,8 @@ object WikiService {
 
   def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
 
-  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings) =
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
-    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort)).replaceFirst("\\.git\\Z", ".wiki.git")
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
 }
 
 trait WikiService {

src/main/scala/servlet/AutoUpdateListener.scala

@@ -98,7 +98,7 @@ object AutoUpdate {
    */
   def getCurrentVersion(): Version = {
     if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").split("\\.") match {
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
         case Array(majorVersion, minorVersion) => {
           versions.find { v => 
             v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -99,12 +99,16 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
       using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
         commands.asScala.foreach { command =>
           logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-          val commits = command.getType match {
+          val refName = command.getRefName.split("/")
+          val branchName = refName.drop(2).mkString("/")
+          val commits = if (refName(1) == "tags") {
+            Nil
+          } else {
+            command.getType match {
               case ReceiveCommand.Type.DELETE => Nil
               case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
             }
-          val refName = command.getRefName.split("/")
+          }
-          val branchName = refName.drop(2).mkString("/")
 
           // Extract new commit and apply issue comment
           val newCommits = if(commits.size > 1000){

src/main/scala/util/JGitUtil.scala

@@ -76,11 +76,7 @@ object JGitUtil {
         rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val summary = defining(fullMessage.trim.indexOf("\n")){ i =>
+    val summary = getSummaryMessage(fullMessage, shortMessage)
-      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
-        if(firstLine.length > shortMessage.length) shortMessage else firstLine
-      }
-    }
 
     val description = defining(fullMessage.trim.indexOf("\n")){ i =>
       if(i >= 0){
@@ -220,16 +216,18 @@ object JGitUtil {
 
     val commits = getLatestCommitFromPaths(git, list.toList.map(_._3), revision)
     list.map { case (objectId, fileMode, path, name, linkUrl) =>
+      defining(commits(path)){ commit =>
         FileInfo(
           objectId,
           fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
           name,
-        commits(path).getCommitterIdent.getWhen,
+          commit.getCommitterIdent.getWhen,
-        commits(path).getShortMessage,
+          getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
-        commits(path).getName,
+          commit.getName,
-        commits(path).getCommitterIdent.getName,
+          commit.getCommitterIdent.getName,
-        commits(path).getCommitterIdent.getEmailAddress,
+          commit.getCommitterIdent.getEmailAddress,
           linkUrl)
+      }
     }.sortWith { (file1, file2) =>
       (file1.isDirectory, file2.isDirectory) match {
         case (true , false) => true
@@ -239,6 +237,17 @@ object JGitUtil {
     }.toList
   }
 
+  /**
+   * Returns the first line of the commit message.
+   */
+  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
+    defining(fullMessage.trim.indexOf("\n")){ i =>
+      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
+        if(firstLine.length > shortMessage.length) shortMessage else firstLine
+      }
+    }
+  }
+
   /**
    * Returns the commit list of the specified branch.
    * 

src/main/scala/view/AvatarImageProvider.scala

@@ -16,7 +16,7 @@ trait AvatarImageProvider { self: RequestCache =>
     val src = if(mailAddress.isEmpty){
       // by user name
       getAccountByUserName(userName).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
+        if(account.image.isEmpty && context.settings.gravatar){
           s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/${account.userName}/_avatar"""
@@ -27,13 +27,13 @@ trait AvatarImageProvider { self: RequestCache =>
     } else {
       // by mail address
       getAccountByMailAddress(mailAddress).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
+        if(account.image.isEmpty && context.settings.gravatar){
           s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/${account.userName}/_avatar"""
         }
       } getOrElse {
-        if(getSystemSettings().gravatar){
+        if(context.settings.gravatar){
           s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/_unknown/_avatar"""

src/main/twirl/account/edit.scala.html

@@ -1,4 +1,4 @@
-@(account: model.Account, settings: service.SystemSettingsService.SystemSettings, info: Option[Any])(implicit context: app.Context)
+@(account: model.Account, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import util.AccountUtil

src/main/twirl/account/ssh.scala.html

@@ -1,4 +1,4 @@
-@(account: model.Account, settings: service.SystemSettingsService.SystemSettings, sshKeys: List[model.SshKey])(implicit context: app.Context)
+@(account: model.Account, sshKeys: List[model.SshKey])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("SSH Keys"){

src/main/twirl/admin/system.scala.html

@@ -1,4 +1,4 @@
-@(settings: service.SystemSettingsService.SystemSettings, info: Option[Any])(implicit context: app.Context)
+@(info: Option[Any])(implicit context: app.Context)
 @import context._
 @import util.Directory._
 @import view.helpers._

src/main/twirl/index.scala.html

@@ -1,6 +1,5 @@
 @(activities: List[model.Activity],
   recentRepositories: List[service.RepositoryService.RepositoryInfo],
-  systemSettings: service.SystemSettingsService.SystemSettings,
   userRepositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -12,7 +11,7 @@
   </div>
   <div class="span4">
     @if(loginAccount.isEmpty){
-      @signinform(systemSettings)
+      @signinform(settings)
     } else {
       <table class="table table-bordered">
         <tr>

src/main/twirl/issues/create.scala.html

@@ -33,7 +33,7 @@
                 <input type="hidden" name="milestoneId" value=""/>
                 @helper.html.dropdown() {
                   <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-                  @milestones.map { milestone =>
+                  @milestones.filter(_.closedDate.isEmpty).map { milestone =>
                     <li>
                       <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                         <i class="icon-while"></i> @milestone.title

src/main/twirl/issues/issuedetail.scala.html

@@ -54,7 +54,7 @@
         @if(hasWritePermission){
           @helper.html.dropdown() {
             <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-            @milestones.map { case (milestone, _, _) =>
+            @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                   @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title

src/main/twirl/repo/blob.scala.html

@@ -2,13 +2,12 @@
   repository: service.RepositoryService.RepositoryInfo,
   pathList: List[String],
   content: util.JGitUtil.ContentInfo,
-  latestCommit: util.JGitUtil.CommitInfo,
+  latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.header("code", repository)
-  @tab(branch, repository, "files", settings)
+  @tab(branch, repository, "files")
   <div class="head">
     <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>

src/main/twirl/repo/branches.scala.html

@@ -1,12 +1,11 @@
 @(branchInfo: Seq[(String, java.util.Date)],
   hasWritePermission: Boolean,
-  repository: service.RepositoryService.RepositoryInfo,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.header("code", repository)
-  @tab(repository.repository.defaultBranch, repository, "branches", settings, true)
+  @tab(repository.repository.defaultBranch, repository, "branches", true)
   <h1>Branches</h1>
   <table class="table table-bordered">
     <tr>

src/main/twirl/repo/commit.scala.html

@@ -4,14 +4,13 @@
   tags: List[String],
   repository: service.RepositoryService.RepositoryInfo,
   diffs: Seq[util.JGitUtil.DiffInfo],
-  oldCommitId: Option[String],
+  oldCommitId: Option[String])(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import util.Implicits._
 @html.main(commit.shortMessage, Some(repository)){
   @html.header("code", repository)
-  @tab(commitId, repository, "commits", settings)
+  @tab(commitId, repository, "commits")
   <table class="table table-bordered">
     <tr>
       <th>

src/main/twirl/repo/commits.scala.html

@@ -3,13 +3,12 @@
   repository: service.RepositoryService.RepositoryInfo,
   commits: Seq[Seq[util.JGitUtil.CommitInfo]],
   page: Int,
-  hasNext: Boolean,
+  hasNext: Boolean)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.header("code", repository)
-  @tab(branch, repository, if(pathList.isEmpty) "commits" else "files", settings)
+  @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
   <div class="head">
     @if(pathList.isEmpty){
       <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> / Commit History

src/main/twirl/repo/files.scala.html

@@ -3,13 +3,12 @@
   pathList: List[String],
   latestCommit: util.JGitUtil.CommitInfo,
   files: List[util.JGitUtil.FileInfo],
-  readme: Option[(util.JGitUtil.FileInfo, String)],
+  readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.header("code", repository)
-  @tab(branch, repository, "files", settings)
+  @tab(branch, repository, "files")
   <div class="head">
     <div class="pull-right">
       @defining(repository.commitCount){ commitCount =>

src/main/twirl/repo/tab.scala.html

@@ -1,5 +1,4 @@
 @(id: String, repository: service.RepositoryService.RepositoryInfo, active: String,
-  settings: service.SystemSettingsService.SystemSettings,
   hideBranchPulldown: Boolean = false)(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -24,7 +23,7 @@
   <li@if(active=="tags"    ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
   <li class="pull-right">
     @helper.html.copy("repository-url-copy", repository.httpUrl, true){
-      @if(settings.ssh){
+      @if(settings.ssh && loginAccount.isDefined){
         <div class="btn-group add-on" data-toggle="buttons-radio" style="padding: 0px; border-width: 0px;">
           <button type="button" class="btn active" id="repository-url-http">HTTP</button><button type="button" class="btn" id="repository-url-ssh">SSH</button>
         </div>
@@ -40,7 +39,7 @@
     </div>
   </li>
 </ul>
-@if(settings.ssh){
+@if(settings.ssh && loginAccount.isDefined){
 <script>
 $(function(){
   $('#repository-url-http').click(function(){
@@ -48,7 +47,7 @@ $(function(){
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
   $('#repository-url-ssh').click(function(){
-    $('#repository-url').val('@repository.sshUrl(settings.sshPort.getOrElse(service.SystemSettingsService.DefaultSshPort))');
+    $('#repository-url').val('@repository.sshUrl(settings.sshPort.getOrElse(service.SystemSettingsService.DefaultSshPort), loginAccount.get.userName)');
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
 });

src/main/twirl/repo/tags.scala.html

@@ -1,10 +1,9 @@
-@(repository: service.RepositoryService.RepositoryInfo,
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.header("code", repository)
-  @tab(repository.repository.defaultBranch, repository, "tags", settings, true)
+  @tab(repository.repository.defaultBranch, repository, "tags", true)
   <h1>Tags</h1>
   <table class="table table-bordered">
     <tr>

src/main/twirl/signin.scala.html

@@ -1,7 +1,7 @@
-@(systemSettings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
+@()(implicit context: app.Context)
 @import context._
 @main("Sign in"){
   <div class="signin-form">
-    @signinform(systemSettings)
+    @signinform(settings)
   </div>
 }

src/main/twirl/wiki/compare.scala.html

@@ -4,7 +4,6 @@
   diffs: Seq[util.JGitUtil.DiffInfo],
   repository: service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean,
-  settings: service.SystemSettingsService.SystemSettings,
   info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -12,7 +11,7 @@
 @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
   @helper.html.information(info)
   @html.header("wiki", repository)
-  @tab("history", repository, settings)
+  @tab("history", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>

src/main/twirl/wiki/edit.scala.html

@@ -1,12 +1,11 @@
 @(pageName: String,
   page: Option[service.WikiService.WikiPageInfo],
-  repository: service.RepositoryService.RepositoryInfo,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
-  @tab("", repository, settings)
+  @tab("", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>

src/main/twirl/wiki/history.scala.html

@@ -1,12 +1,11 @@
 @(pageName: Option[String],
   commits: List[util.JGitUtil.CommitInfo],
-  repository: service.RepositoryService.RepositoryInfo,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
-  @tab(if(pageName.isEmpty) "history" else "", repository, settings)
+  @tab(if(pageName.isEmpty) "history" else "", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title">

src/main/twirl/wiki/page.scala.html

@@ -1,13 +1,12 @@
 @(pageName: String,
   page: service.WikiService.WikiPageInfo,
   repository: service.RepositoryService.RepositoryInfo,
-  hasWritePermission: Boolean,
+  hasWritePermission: Boolean)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
-  @tab((if(pageName == "Home") "home" else ""), repository, settings)
+  @tab((if(pageName == "Home") "home" else ""), repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title">@pageName</h1>

src/main/twirl/wiki/pages.scala.html

@@ -1,12 +1,11 @@
 @(pages: List[String],
   repository: service.RepositoryService.RepositoryInfo,
-  hasWritePermission: Boolean,
+  hasWritePermission: Boolean)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
-  @tab("pages", repository, settings)
+  @tab("pages", repository)
   <ul class="nav nav-tabs">
     <li>
       <h1 class="wiki-title"><span class="muted">Pages</span></h1>

src/main/twirl/wiki/tab.scala.html

@@ -1,6 +1,5 @@
 @(active: String,
-  repository: service.RepositoryService.RepositoryInfo,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-  settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
 @import context._
 @import service.WikiService._
 @import view.helpers._
@@ -10,7 +9,7 @@
   <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
   <li class="pull-right">
     @helper.html.copy("repository-url-copy", httpUrl(repository), true){
-      @if(settings.ssh){
+      @if(settings.ssh && loginAccount.isDefined){
         <div class="btn-group add-on" data-toggle="buttons-radio" style="padding: 0px; border-width: 0px;">
           <button type="button" class="btn active" id="repository-url-http">HTTP</button><button type="button" class="btn" id="repository-url-ssh">SSH</button>
         </div>
@@ -21,7 +20,7 @@
     }
   </li>
 </ul>
-@if(settings.ssh){
+@if(settings.ssh && loginAccount.isDefined){
 <script>
 $(function(){
   $('#repository-url-http').click(function(){
@@ -29,7 +28,7 @@ $(function(){
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
   $('#repository-url-ssh').click(function(){
-    $('#repository-url').val('@sshUrl(repository, settings)');
+    $('#repository-url').val('@sshUrl(repository, settings, loginAccount.get.userName)');
     $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
   });
 });

src/main/webapp/assets/common/css/gitbucket.css

@@ -458,10 +458,9 @@ ul#commit-file-list li.border {
 li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9 {
   list-style-type: decimal;
   background: white;
-}
+  border-left: 1px solid #E5E5E5;
-
+  padding-left: 10px;
-li.L1, li.L3, li.L5, li.L7, li.L9 {
+  color: rgba(0, 0, 0, 0.3);
-  background: #f5f5f5;
 }
 
 pre.blob {

src/main/webapp/assets/common/js/gitbucket.js

@@ -34,3 +34,14 @@ $(function(){
   // syntax highlighting by google-code-prettify
   prettyPrint();
 });
+
+function displayErrors(data){
+  var i = 0;
+  $.each(data, function(key, value){
+    $('#error-' + key.split(".").join("_")).text(value);
+    if(i == 0){
+      $('#' + key).focus();
+    }
+    i++;
+  });
+}

src/main/webapp/assets/jsdifflib/diffview.css

@@ -35,12 +35,22 @@ table.diff {
 table.diff tbody { 
 	font-family:Courier, monospace
 }
+table.diff tbody tr:hover {
+	background-color:#F8EEC7;
+}
+
+table.diff tbody tr:hover th {
+	background-color:#F6E8B5;
+}
+table.diff tbody tr:hover td {
+	background-color:#F6E8B5;
+}
 table.diff tbody th {
 	font-family:verdana,arial,'Bitstream Vera Sans',helvetica,sans-serif;
-	background:#EED;
+	background-color:#FBFBFB;
 	font-size:11px;
 	font-weight:normal;
-	border:1px solid #BBC;
+	border-top:none; /* for overriding bootstrap */
 	color:#886;
 	padding:.3em .5em .1em 2em;
 	text-align:right;
@@ -58,6 +68,7 @@ table.diff tbody td {
 	padding:0px .4em;
 	padding-top:.4em;
 	vertical-align:top;
+	border-top: none;
 }
 table.diff .empty {
 	background-color:#DDD;
@@ -69,9 +80,10 @@ table.diff .delete {
 	background-color:#FFDDDD;
 }
 table.diff .skip {
-	background-color:#EFEFEF;
+	background-color: #F8F8FF;
-	border:1px solid #AAA;
+}
-	border-right:1px solid #BBC;
+table.diff .skip:before {
+	content: "    ...";
 }
 table.diff .insert {
 	background-color:#DDFFDD

src/test/scala/view/AvatarImageProviderSpec.scala

@@ -10,53 +10,58 @@ import twirl.api.Html
 
 class AvatarImageProviderSpec extends Specification {
 
-  implicit val context = app.Context("", None, null)
-
   "getAvatarImageHtml" should {
     "show Gravatar image for no image account if gravatar integration is enabled" in {
-      val provider = new AvatarImageProviderImpl(Some(createAccount(None)), createSystemSettings(true))
+      implicit val context = app.Context(createSystemSettings(true), None, null)
+      val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
 
       provider.toHtml("user", 20).toString mustEqual
         "<img src=\"https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?s=20\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "show uploaded image even if gravatar integration is enabled" in {
-      val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))), createSystemSettings(true))
+      implicit val context = app.Context(createSystemSettings(true), None, null)
+      val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
 
       provider.toHtml("user", 20).toString mustEqual
         "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "show local image for no image account if gravatar integration is disabled" in {
-      val provider = new AvatarImageProviderImpl(Some(createAccount(None)), createSystemSettings(false))
+      implicit val context = app.Context(createSystemSettings(false), None, null)
+      val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
 
       provider.toHtml("user", 20).toString mustEqual
         "<img src=\"/user/_avatar\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "show Gravatar image for specified mail address if gravatar integration is enabled" in {
-      val provider = new AvatarImageProviderImpl(None, createSystemSettings(true))
+      implicit val context = app.Context(createSystemSettings(true), None, null)
+      val provider = new AvatarImageProviderImpl(None)
 
       provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
         "<img src=\"https://www.gravatar.com/avatar/4712f9b0e63f56ad952ad387eaa23b9c?s=20\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "show unknown image for unknown user if gravatar integration is enabled" in {
-      val provider = new AvatarImageProviderImpl(None, createSystemSettings(true))
+      implicit val context = app.Context(createSystemSettings(true), None, null)
+      val provider = new AvatarImageProviderImpl(None)
 
       provider.toHtml("user", 20).toString mustEqual
         "<img src=\"/_unknown/_avatar\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "show unknown image for specified mail address if gravatar integration is disabled" in {
-      val provider = new AvatarImageProviderImpl(None, createSystemSettings(false))
+      implicit val context = app.Context(createSystemSettings(false), None, null)
+      val provider = new AvatarImageProviderImpl(None)
 
       provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
         "<img src=\"/_unknown/_avatar\" class=\"avatar\" style=\"width: 20px; height: 20px;\" />"
     }
 
     "add tooltip if it's enabled" in {
-      val provider = new AvatarImageProviderImpl(None, createSystemSettings(false))
+      implicit val context = app.Context(createSystemSettings(false), None, null)
+      val provider = new AvatarImageProviderImpl(None)
 
       provider.toHtml("user", 20, "hoge@hoge.com", true).toString mustEqual
         "<img src=\"/_unknown/_avatar\" class=\"avatar\" style=\"width: 20px; height: 20px;\" data-toggle=\"tooltip\" title=\"user\"/>"
@@ -80,7 +85,7 @@ class AvatarImageProviderSpec extends Specification {
 
   private def createSystemSettings(useGravatar: Boolean) =
     SystemSettings(
-      baseUrl                  = None,
+      baseUrl                  = Some(""),
       allowAccountRegistration = false,
       gravatar                 = useGravatar,
       notification             = false,
@@ -93,15 +98,13 @@ class AvatarImageProviderSpec extends Specification {
   /**
    * Adapter to test AvatarImageProviderImpl.
    */
-  class AvatarImageProviderImpl(account: Option[Account], settings: SystemSettings)
+  class AvatarImageProviderImpl(account: Option[Account]) extends AvatarImageProvider with RequestCache {
-      extends AvatarImageProvider with RequestCache {
 
     def toHtml(userName: String, size: Int,  mailAddress: String = "", tooltip: Boolean = false)
               (implicit context: app.Context): Html = getAvatarImageHtml(userName, size, mailAddress, tooltip)
 
     override def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = account
     override def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = account
-    override def getSystemSettings()(implicit context: app.Context): SystemSettings = settings
   }
 
 }