Replace String#format() with string interpolation.

I applied quick fix to release 1.3. Please update after 1.3 release if you have better solution.

.gitignore

@@ -14,3 +14,7 @@ project/plugins/project/
 .classpath
 .project
 .cache
+
+# IntelliJ specific
+.idea/
+.idea_modules/

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,7 +1,7 @@
 GitBucket
 =========
 
-GitBucket is a Github clone by Scala, Easy to setup.
+GitBucket is the easily installable Github clone written with Scala.
 
 The current version of GitBucket provides a basic features below:
 
@@ -9,12 +9,12 @@ The current version of GitBucket provides a basic features below:
 - Repository viewer (some advanced features are not implemented)
 - Wiki
 - Issues
+- Activity timeline
 - User management (for Administrators)
 
 Following features are not implemented, but we will make them in the future release!
 
 - Fork and pull request
-- Timeline
 - Search
 - Network graph
 - Statics
@@ -32,9 +32,29 @@ Installation
 
 The default administrator account is **root** and password is **root**.
 
+To upgrade GitBucket, only replace gitbucket.war.
+
 Release Notes
 --------
+### 1.3 - xx Jul 2013
+- Batch updating for issues.
+- Display assigned user on issue list.
+- User icon and Gravatar support.
+- Convert @xxxx to link to the account page.
+- Add copy to clipboard button for git clone URL.
+- Allows multi-byte characters as wiki page name.
+- Allows to create the empty repository.
+- Fixed some bugs.
+
+### 1.2 - 09 Jul 2013
+- Added activity timeline.
+- Bugfix for Git 1.8.1.5 or later.
+- Allows multi-byte characters as label.
+- Fixed some bugs.
+
+### 1.1 - 05 Jul 2013
+- Fixed some bugs.
+- Upgrade to JGit 3.0.
 
 ### 1.0 - 04 Jul 2013
-
 - This is a first public release.

src/main/resources/update/1_2.sql

@@ -0,0 +1,24 @@
+CREATE TABLE ACTIVITY(
+		ACTIVITY_ID INT AUTO_INCREMENT,
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ACTIVITY_USER_NAME VARCHAR(100) NOT NULL,
+		ACTIVITY_TYPE VARCHAR(100) NOT NULL,
+		MESSAGE TEXT NOT NULL,
+		ADDITIONAL_INFO TEXT,
+		ACTIVITY_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE COMMIT_LOG (
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		COMMIT_ID VARCHAR(40) NOT NULL
+);
+
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_PK PRIMARY KEY (ACTIVITY_ID);
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ACTIVITY ADD CONSTRAINT IDX_ACTIVITY_FK1 FOREIGN KEY (ACTIVITY_USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE COMMIT_LOG ADD CONSTRAINT IDX_COMMIT_LOG_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, COMMIT_ID);
+ALTER TABLE COMMIT_LOG ADD CONSTRAINT IDX_COMMIT_LOG_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+

src/main/resources/update/1_3.sql

@@ -0,0 +1,8 @@
+ALTER TABLE ACCOUNT ADD COLUMN IMAGE VARCHAR(100);
+
+UPDATE ISSUE_COMMENT SET ACTION = 'comment' WHERE ACTION IS NULL;
+
+ALTER TABLE ISSUE_COMMENT ALTER COLUMN ACTION VARCHAR(20) NOT NULL;
+
+UPDATE ISSUE_COMMENT SET ACTION = 'close_comment'  WHERE ACTION = 'close';
+UPDATE ISSUE_COMMENT SET ACTION = 'reopen_comment' WHERE ACTION = 'reopen';

src/main/scala/ScalatraBootstrap.scala

@@ -5,6 +5,7 @@ import javax.servlet._
 class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
     context.mount(new IndexController, "/")
+    context.mount(new FileUploadController, "/upload")
     context.mount(new SignInController, "/*")
     context.mount(new UserManagementController, "/*")
     context.mount(new SystemSettingsController, "/*")
@@ -15,7 +16,7 @@ class ScalatraBootstrap extends LifeCycle {
     context.mount(new LabelsController, "/*")
     context.mount(new MilestonesController, "/*")
     context.mount(new IssuesController, "/*")
-    context.mount(new SettingsController, "/*")
+    context.mount(new RepositorySettingsController, "/*")
 
     val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
     if(!dir.exists){

src/main/scala/app/AccountController.scala

@@ -1,31 +1,41 @@
 package app
 
 import service._
-import util.OneselfAuthenticator
+import util.{FileUtil, FileUploadUtil, OneselfAuthenticator}
 import util.StringUtil._
+import util.Directory._
 import jp.sf.amateras.scalatra.forms._
+import org.apache.commons.io.FileUtils
+import org.scalatra.FlashMapSupport
 
 class AccountController extends AccountControllerBase
-  with SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator
+  with SystemSettingsService with AccountService with RepositoryService with ActivityService
+  with OneselfAuthenticator
 
-trait AccountControllerBase extends ControllerBase {
+trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport {
-  self: SystemSettingsService with AccountService with RepositoryService with OneselfAuthenticator =>
+  self: SystemSettingsService with AccountService with RepositoryService with ActivityService
+    with OneselfAuthenticator =>
 
-  case class AccountNewForm(userName: String, password: String,mailAddress: String, url: Option[String])
+  case class AccountNewForm(userName: String, password: String,mailAddress: String,
+                            url: Option[String], fileId: Option[String])
 
-  case class AccountEditForm(password: Option[String], mailAddress: String, url: Option[String])
+  case class AccountEditForm(password: Option[String], mailAddress: String,
+                             url: Option[String], fileId: Option[String], clearImage: Boolean)
 
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200)))))
+    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      , optional(text())))
   )(AccountNewForm.apply)
 
   val editForm = mapping(
     "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200)))))
+    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  , boolean()))
   )(AccountEditForm.apply)
 
   /**
@@ -33,52 +43,63 @@ trait AccountControllerBase extends ControllerBase {
    */
   get("/:userName") {
     val userName = params("userName")
-    getAccountByUserName(userName).map {
+    getAccountByUserName(userName).map { x =>
-      account.html.info(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
+      params.getOrElse("tab", "repositories") match {
+        // Public Activity
+        case "activity" => account.html.activity(x, getActivitiesByUser(userName, true))
+        // Repositories
+        case _ => account.html.repositories(x, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
+      }
     } getOrElse NotFound
   }
 
+  get("/:userName/_avatar"){
+    val userName = params("userName")
+    getAccountByUserName(userName).flatMap(_.image).map { image =>
+      contentType = FileUtil.getMimeType(image)
+      new java.io.File(getUserUploadDir(userName), image)
+    } getOrElse {
+      contentType = "image/png"
+      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+    }
+  }
+
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
-    getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
+    getAccountByUserName(userName).map(x => account.html.edit(Some(x), flash.get("info"))) getOrElse NotFound
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       updateAccount(account.copy(
-        password    = form.password.map(encrypt).getOrElse(account.password),
+        password    = form.password.map(sha1).getOrElse(account.password),
         mailAddress = form.mailAddress,
         url         = form.url))
-      redirect("/%s".format(userName))
+
+      updateImage(userName, form.fileId, form.clearImage)
+      flash += "info" -> "Account information has been updated."
+      redirect(s"/${userName}/_edit")
+
     } getOrElse NotFound
   })
 
   get("/register"){
     if(loadSystemSettings().allowAccountRegistration){
-      account.html.edit(None)
+      if(context.loginAccount.isDefined){
+        redirect("/")
+      } else {
+        account.html.edit(None, None)
+      }
     } else NotFound
   }
 
-  post("/register", newForm){ newForm =>
+  post("/register", newForm){ form =>
     if(loadSystemSettings().allowAccountRegistration){
-      createAccount(newForm.userName, encrypt(newForm.password), newForm.mailAddress, false, newForm.url)
+      createAccount(form.userName, sha1(form.password), form.mailAddress, false, form.url)
+      updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound
   }
 
-  // TODO Merge with UserManagementController
-  private def uniqueUserName: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      getAccountByUserName(value).map { _ => "User already exists." }
-  }
-
-  // TODO Merge with UserManagementController
-  private def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      getAccountByMailAddress(value)
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
-        .map    { _ => "Mail address is already registered." }
-  }
-
 }

src/main/scala/app/ControllerBase.scala

@@ -1,14 +1,19 @@
 package app
 
-import model.Account
+import _root_.util.Directory._
-import util.Validations
+import _root_.util.{FileUploadUtil, FileUtil, Validations}
 import org.scalatra._
 import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
+import org.apache.commons.io.FileUtils
+import model.Account
+import scala.Some
+import service.AccountService
+import javax.servlet.http.HttpServletRequest
 
 /**
- * Provides generic features for ScalatraServlet implementations.
+ * Provides generic features for controller implementations.
  */
 abstract class ControllerBase extends ScalatraFilter
   with ClientSideValidationFormSupport with JacksonJsonSupport with Validations {
@@ -18,7 +23,7 @@ abstract class ControllerBase extends ScalatraFilter
   /**
    * Returns the context object for the request.
    */
-  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL)
+  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL, request)
 
   private def currentURL: String = {
     val queryString = request.getQueryString
@@ -87,4 +92,60 @@ abstract class ControllerBase extends ScalatraFilter
 
 }
 
-case class Context(path: String, loginAccount: Option[Account], currentUrl: String)
+/**
+ * Context object for the current request.
+ */
+case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest){
+
+  /**
+   * Get object from cache.
+   *
+   * If object has not been cached with the specified key then retrieves by given action.
+   * Cached object are available during a request.
+   */
+  def cache[A](key: String)(action: => A): A = {
+    Option(request.getAttribute("cache." + key).asInstanceOf[A]).getOrElse {
+      val newObject = action
+      request.setAttribute("cache." + key, newObject)
+      newObject
+    }
+  }
+
+}
+
+/**
+ * Base trait for controllers which manages account information.
+ */
+trait AccountManagementControllerBase extends ControllerBase { self: AccountService =>
+
+  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit = {
+    if(clearImage){
+      getAccountByUserName(userName).flatMap(_.image).map { image =>
+        new java.io.File(getUserUploadDir(userName), image).delete()
+        updateAvatarImage(userName, None)
+      }
+    } else {
+      fileId.map { fileId =>
+        val filename = "avatar." + FileUtil.getExtension(FileUploadUtil.getUploadedFilename(fileId).get)
+        FileUtils.moveFile(
+          FileUploadUtil.getTemporaryFile(fileId),
+          new java.io.File(getUserUploadDir(userName), filename)
+        )
+        updateAvatarImage(userName, Some(filename))
+      }
+    }
+  }
+
+  protected def uniqueUserName: Constraint = new Constraint(){
+    def validate(name: String, value: String): Option[String] =
+      getAccountByUserName(value).map { _ => "User already exists." }
+  }
+
+  protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
+    def validate(name: String, value: String): Option[String] =
+      getAccountByMailAddress(value)
+        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
+        .map    { _ => "Mail address is already registered." }
+  }
+
+}

src/main/scala/app/CreateRepositoryController.scala

@@ -1,7 +1,7 @@
 package app
 
 import util.Directory._
-import util.UsersAuthenticator
+import util.{JGitUtil, UsersAuthenticator}
 import service._
 import java.io.File
 import org.eclipse.jgit.api.Git
@@ -10,19 +10,23 @@ import org.apache.commons.io._
 import jp.sf.amateras.scalatra.forms._
 
 class CreateRepositoryController extends CreateRepositoryControllerBase
-  with RepositoryService with AccountService with WikiService with LabelsService with UsersAuthenticator
+  with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
+  with UsersAuthenticator
 
 /**
  * Creates new repository.
  */
 trait CreateRepositoryControllerBase extends ControllerBase {
-  self: RepositoryService with WikiService with LabelsService with UsersAuthenticator =>
+  self: RepositoryService with WikiService with LabelsService with ActivityService
+    with UsersAuthenticator =>
 
-  case class RepositoryCreationForm(name: String, description: Option[String])
+  case class RepositoryCreationForm(name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
 
   val form = mapping(
-    "name"        -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
+    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
-    "description" -> trim(label("Description"    , optional(text())))
+    "description"  -> trim(label("Description"    , optional(text()))),
+    "isPrivate"    -> trim(label("Repository Type", boolean())),
+    "createReadme" -> trim(label("Create README"  , boolean()))
   )(RepositoryCreationForm.apply)
 
   /**
@@ -36,10 +40,11 @@ trait CreateRepositoryControllerBase extends ControllerBase {
    * Create new repository.
    */
   post("/new", form)(usersOnly { form =>
-    val loginUserName = context.loginAccount.get.userName
+    val loginAccount  = context.loginAccount.get
+    val loginUserName = loginAccount.userName
 
     // Insert to the database at first
-    createRepository(form.name, loginUserName, form.description)
+    createRepository(form.name, loginUserName, form.description, form.isPrivate)
 
     // Insert default labels
     createLabel(loginUserName, form.name, "bug", "fc2929")
@@ -51,41 +56,44 @@ trait CreateRepositoryControllerBase extends ControllerBase {
 
     // Create the actual repository
     val gitdir = getRepositoryDir(loginUserName, form.name)
-    val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
+    JGitUtil.initRepository(gitdir)
 
-    repository.create
+    if(form.createReadme){
+      val tmpdir = getInitRepositoryDir(loginUserName, form.name)
+      try {
+        // Clone the repository
+        Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
 
-    val config = repository.getConfig
+        // Create README.md
-    config.setBoolean("http", null, "receivepack", true)
+        FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
-    config.save
+          if(form.description.nonEmpty){
+            form.name + "\n" +
+            "===============\n" +
+            "\n" +
+            form.description.get
+          } else {
+            form.name + "\n" +
+            "===============\n"
+          }, "UTF-8")
 
-    val tmpdir = getInitRepositoryDir(loginUserName, form.name)
+        val git = Git.open(tmpdir)
-    try {
+        git.add.addFilepattern("README.md").call
-      // Clone the repository
+        git.commit.setMessage("Initial commit").call
-      Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
+        git.push.call
-    
+
-      // Create README.md
+      } finally {
-      FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
+        FileUtils.deleteDirectory(tmpdir)
-        if(form.description.nonEmpty){
+      }
-          form.name + "\n===============\n\n" + form.description.get
-        } else {
-          form.name + "\n===============\n"
-        }, "UTF-8")
-  
-      val git = Git.open(tmpdir)
-      git.add.addFilepattern("README.md").call
-      git.commit.setMessage("Initial commit").call
-      git.push.call
-    
-    } finally {
-      FileUtils.deleteDirectory(tmpdir)
     }
 
     // Create Wiki repository
-    createWikiRepository(context.loginAccount.get, form.name)
+    createWikiRepository(loginAccount, form.name)
+
+    // Record activity
+    recordCreateRepositoryActivity(loginUserName, form.name, loginUserName)
 
     // redirect to the repository
-    redirect("/%s/%s".format(loginUserName, form.name))
+    redirect(s"/${loginUserName}/${form.name}")
   })
   
   /**

src/main/scala/app/FileUploadController.scala

@@ -0,0 +1,31 @@
+package app
+
+import util.{FileUtil, FileUploadUtil}
+import org.scalatra._
+import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
+import org.apache.commons.io.FileUtils
+
+/**
+ * Provides Ajax based file upload functionality.
+ *
+ * This servlet saves uploaded file as temporary file and returns the unique id.
+ * You can get uploaded file using [[util.FileUploadUtil#getTemporaryFile()]] with this id.
+ */
+// TODO Remove temporary files at session timeout by session listener.
+class FileUploadController extends ScalatraServlet with FileUploadSupport with FlashMapSupport {
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
+
+  post("/image"){
+    fileParams.get("file") match {
+      case Some(file) if(FileUtil.isImage(file.name)) => {
+        val fileId  = FileUploadUtil.generateFileId
+        FileUtils.writeByteArrayToFile(FileUploadUtil.getTemporaryFile(fileId), file.get)
+        session += "upload_" + fileId -> file.name
+        Ok(fileId)
+      }
+      case None => BadRequest
+    }
+  }
+
+}
+

src/main/scala/app/IndexController.scala

@@ -2,13 +2,20 @@ package app
 
 import service._
 
-class IndexController extends IndexControllerBase with RepositoryService with AccountService with SystemSettingsService
+class IndexController extends IndexControllerBase 
+  with RepositoryService with AccountService with SystemSettingsService with ActivityService
 
-trait IndexControllerBase extends ControllerBase { self: RepositoryService with SystemSettingsService =>
+trait IndexControllerBase extends ControllerBase { self: RepositoryService 
+  with SystemSettingsService with ActivityService =>
   
   get("/"){
-    html.index(getAccessibleRepositories(context.loginAccount, baseUrl), loadSystemSettings(),
+    val loginAccount = context.loginAccount
-      context.loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil))
+
+    html.index(getRecentActivities(),
+      getAccessibleRepositories(loginAccount, baseUrl),
+      loadSystemSettings(),
+      loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil)
+    )
   }
 
 }

src/main/scala/app/IssuesController.scala

@@ -8,19 +8,18 @@ import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, ReadableUsersAut
 import org.scalatra.Ok
 
 class IssuesController extends IssuesControllerBase
-  with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService
+  with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
   with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService with RepositoryService with LabelsService with MilestonesService
+  self: IssuesService with RepositoryService with LabelsService with MilestonesService with ActivityService
     with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   case class IssueCreateForm(title: String, content: Option[String],
     assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
-
   case class IssueEditForm(title: String, content: Option[String])
-
   case class CommentForm(issueId: Int, content: String)
+  case class IssueStateForm(issueId: Int, content: Option[String])
 
   val issueCreateForm = mapping(
       "title"            -> trim(label("Title", text(required))),
@@ -40,6 +39,11 @@ trait IssuesControllerBase extends ControllerBase {
       "content" -> trim(label("Comment", text(required)))
     )(CommentForm.apply)
 
+  val issueStateForm = mapping(
+      "issueId" -> label("Issue Id", number()),
+      "content" -> trim(optional(text()))
+    )(IssueStateForm.apply)
+
   get("/:owner/:repository/issues")(referrersOnly {
     searchIssues("all", _)
   })
@@ -86,11 +90,14 @@ trait IssuesControllerBase extends ControllerBase {
     val owner    = repository.owner
     val name     = repository.name
     val writable = hasWritePermission(owner, name, context.loginAccount)
+    val userName = context.loginAccount.get.userName
 
-    val issueId = createIssue(owner, name, context.loginAccount.get.userName, form.title, form.content,
+    // insert issue
+    val issueId = createIssue(owner, name, userName, form.title, form.content,
       if(writable) form.assignedUserName else None,
       if(writable) form.milestoneId else None)
 
+    // insert labels
     if(writable){
       form.labelNames.map { value =>
         val labels = getLabels(owner, name)
@@ -102,7 +109,10 @@ trait IssuesControllerBase extends ControllerBase {
       }
     }
 
-    redirect("/%s/%s/issues/%d".format(owner, name, issueId))
+    // record activity
+    recordCreateIssueActivity(owner, name, userName, issueId, form.title)
+
+    redirect(s"/${owner}/${name}/issues/${issueId}")
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
@@ -112,28 +122,21 @@ trait IssuesControllerBase extends ControllerBase {
     getIssue(owner, name, params("id")).map { issue =>
       if(isEditable(owner, name, issue.openedUserName)){
         updateIssue(owner, name, issue.issueId, form.title, form.content)
-        redirect("/%s/%s/issues/_data/%d".format(owner, name, issue.issueId))
+        redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
       } else Unauthorized
     } getOrElse NotFound
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    val owner = repository.owner
+    handleComment(form.issueId, Some(form.content), repository)() map { id =>
-    val name  = repository.name
+      redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
+    } getOrElse NotFound
+  })
 
-    getIssue(owner, name, form.issueId.toString).map { issue =>
+  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-      redirect("/%s/%s/issues/%d#comment-%d".format(
+    handleComment(form.issueId, form.content, repository)() map { id =>
-        owner, name, form.issueId,
+      redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
-        createComment(owner, name, context.loginAccount.get.userName,
+    } getOrElse NotFound
-          form.issueId,
-          form.content,
-          if(isEditable(owner, name, issue.openedUserName)){
-            params.get("action") filter { action =>
-              updateClosed(owner, name, form.issueId, if(action == "close") true else false) > 0
-            }
-          } else None)
-      ))
-    }
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -143,7 +146,7 @@ trait IssuesControllerBase extends ControllerBase {
     getComment(owner, name, params("id")).map { comment =>
       if(isEditable(owner, name, comment.commentedUserName)){
         updateComment(comment.commentId, form.content)
-        redirect("/%s/%s/issue_comments/_data/%d".format(owner, name, comment.commentId))
+        redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
       } else Unauthorized
     } getOrElse NotFound
   })
@@ -159,7 +162,7 @@ trait IssuesControllerBase extends ControllerBase {
           org.json4s.jackson.Serialization.write(
               Map("title"   -> x.title,
                   "content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
-                      repository, false, true, true)
+                      repository, false, true)
               ))
         }
       } else Unauthorized
@@ -176,7 +179,7 @@ trait IssuesControllerBase extends ControllerBase {
           contentType = formats("json")
           org.json4s.jackson.Serialization.write(
               Map("content" -> view.Markdown.toHtml(x.content,
-                  repository, false, true, true)
+                  repository, false, true)
               ))
         }
       } else Unauthorized
@@ -198,25 +201,103 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt,
+    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
-        params.get("assignedUserName") filter (_.trim != ""))
     Ok("updated")
   })
 
   ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt,
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
-        params.get("milestoneId") collect { case x if x.trim != "" => x.toInt })
     Ok("updated")
   })
 
+  post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
+    val action = params.get("value")
+
+    executeBatch(repository) {
+      handleComment(_, None, repository)( _ => action)
+    }
+  })
+
+  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
+    val labelId = params("value").toInt
+
+    executeBatch(repository) { issueId =>
+      getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
+        registerIssueLabel(repository.owner, repository.name, issueId, labelId)
+      }
+    }
+  })
+
+  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
+    val value = assignedUserName("value")
+
+    executeBatch(repository) {
+      updateAssignedUserName(repository.owner, repository.name, _, value)
+    }
+  })
+
+  post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
+    val value = milestoneId("value")
+
+    executeBatch(repository) {
+      updateMilestoneId(repository.owner, repository.name, _, value)
+    }
+  })
+
+  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
+  val milestoneId      = (key: String) => params.get(key) collect { case x if x.trim != "" => x.toInt }
+
   private def isEditable(owner: String, repository: String, author: String)(implicit context: app.Context): Boolean =
     hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
+  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
+    params("checked").split(',') map(_.toInt) foreach execute
+    redirect(s"/${repository.owner}/${repository.name}/issues")
+  }
+
+  /**
+   * @see 
+   */
+  private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo)
+      (getAction: model.Issue => Option[String] =
+           p1 => params.get("action").filter(_ => isEditable(p1.userName, p1.repositoryName, p1.openedUserName))) = {
+    val owner    = repository.owner
+    val name     = repository.name
+    val userName = context.loginAccount.get.userName
+
+    getIssue(owner, name, issueId.toString) map { issue =>
+      val (action, recordActivity) =
+        getAction(issue)
+          .collect {
+            case "close"  => true  -> (Some("close")  -> Some(recordCloseIssueActivity _))
+            case "reopen" => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
+          }
+          .map { case (closed, t) =>
+            updateClosed(owner, name, issueId, closed)
+            t
+          }
+          .getOrElse(None -> None)
+
+      val commentId = content
+          .map       ( _ -> action.map( _ + "_comment" ).getOrElse("comment") )
+          .getOrElse ( action.get.capitalize -> action.get )
+          match {
+            case (content, action) => createComment(owner, name, userName, issueId, content, action)
+          }
+
+      // record activity
+      content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) )
+      recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
+
+      commentId
+    }
+  }
+
   private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
     val owner      = repository.owner
     val repoName   = repository.name
     val userName   = if(filter != "all") Some(params("userName")) else None
-    val sessionKey = "%s/%s/issues".format(owner, repoName)
+    val sessionKey = s"${owner}/${repoName}/issues"
 
     val page = try {
       val i = params.getOrElse("page", "1").toInt
@@ -235,8 +316,9 @@ trait IssuesControllerBase extends ControllerBase {
     issues.html.list(
         searchIssue(owner, repoName, condition, filter, userName, (page - 1) * IssueLimit, IssueLimit),
         page,
-        getLabels(owner, repoName),
+        (getCollaborators(owner, repoName) :+ owner).sorted,
         getMilestones(owner, repoName).filter(_.closedDate.isEmpty),
+        getLabels(owner, repoName),
         countIssue(owner, repoName, condition.copy(state = "open"), filter, userName),
         countIssue(owner, repoName, condition.copy(state = "closed"), filter, userName),
         countIssue(owner, repoName, condition, "all", None),

src/main/scala/app/LabelsController.scala

@@ -13,18 +13,18 @@ trait LabelsControllerBase extends ControllerBase {
   case class LabelForm(labelName: String, color: String)
 
   val newForm = mapping(
-    "newLabelName" -> trim(label("Label name", text(required, identifier, maxlength(100)))),
+    "newLabelName" -> trim(label("Label name", text(required, labelName, maxlength(100)))),
     "newColor"     -> trim(label("Color",      text(required, color)))
   )(LabelForm.apply)
 
   val editForm = mapping(
-    "editLabelName" -> trim(label("Label name", text(required, identifier, maxlength(100)))),
+    "editLabelName" -> trim(label("Label name", text(required, labelName, maxlength(100)))),
     "editColor"     -> trim(label("Color",      text(required, color)))
   )(LabelForm.apply)
 
   post("/:owner/:repository/issues/label/new", newForm)(collaboratorsOnly { (form, repository) =>
     createLabel(repository.owner, repository.name, form.labelName, form.color.substring(1))
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/issues")
   })
 
   ajaxGet("/:owner/:repository/issues/label/edit")(collaboratorsOnly { repository =>
@@ -47,4 +47,18 @@ trait LabelsControllerBase extends ControllerBase {
     issues.labels.html.editlist(getLabels(repository.owner, repository.name), repository)
   })
 
+  /**
+   * Constraint for the identifier such as user name, repository name or page name.
+   */
+  private def labelName: Constraint = new Constraint(){
+    def validate(name: String, value: String): Option[String] =
+      if(!value.matches("^[^,]+$")){
+        Some(s"${name} contains invalid character.")
+      } else if(value.startsWith("_") || value.startsWith("-")){
+        Some(s"${name} starts with invalid character.")
+      } else {
+        None
+      }
+  }
+
 }

src/main/scala/app/MilestonesController.scala

@@ -35,7 +35,7 @@ trait MilestonesControllerBase extends ControllerBase {
 
   post("/:owner/:repository/issues/milestones/new", milestoneForm)(collaboratorsOnly { (form, repository) =>
     createMilestone(repository.owner, repository.name, form.title, form.description, form.dueDate)
-    redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
@@ -45,28 +45,28 @@ trait MilestonesControllerBase extends ControllerBase {
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       closeMilestone(milestone)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       openMilestone(milestone)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 

src/main/scala/app/RepositorySettingsController.scala

@@ -5,11 +5,12 @@ import util.Directory._
 import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
+import org.scalatra.FlashMapSupport
 
-class SettingsController extends SettingsControllerBase
+class RepositorySettingsController extends RepositorySettingsControllerBase
   with RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator
 
-trait SettingsControllerBase extends ControllerBase {
+trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport {
   self: RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator =>
 
   case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
@@ -30,14 +31,14 @@ trait SettingsControllerBase extends ControllerBase {
    * Redirect to the Options page.
    */
   get("/:owner/:repository/settings")(ownerOnly { repository =>
-    redirect("/%s/%s/settings/options".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
   })
   
   /**
    * Display the Options page.
    */
   get("/:owner/:repository/settings/options")(ownerOnly {
-    settings.html.options(_)
+    settings.html.options(_, flash.get("info"))
   })
   
   /**
@@ -45,7 +46,8 @@ trait SettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
     saveRepositoryOptions(repository.owner, repository.name, form.description, form.defaultBranch, form.isPrivate)
-    redirect("/%s/%s/settings/options".format(repository.owner, repository.name))
+    flash += "info" -> "Repository settings has been updated."
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
   })
   
   /**
@@ -68,7 +70,7 @@ trait SettingsControllerBase extends ControllerBase {
    */
   post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
     addCollaborator(repository.owner, repository.name, form.userName)
-    redirect("/%s/%s/settings/collaborators".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
   })
 
   /**
@@ -76,7 +78,7 @@ trait SettingsControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
     removeCollaborator(repository.owner, repository.name, params("name"))
-    redirect("/%s/%s/settings/collaborators".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
   })
 
   /**
@@ -96,7 +98,7 @@ trait SettingsControllerBase extends ControllerBase {
     FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
     FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
 
-    redirect("/%s".format(repository.owner))
+    redirect(s"/${repository.owner}")
   })
 
   /**
@@ -104,17 +106,12 @@ trait SettingsControllerBase extends ControllerBase {
    */
   private def collaborator: Constraint = new Constraint(){
     def validate(name: String, value: String): Option[String] = {
+      val paths = request.getRequestURI.split("/")
       getAccountByUserName(value) match {
         case None => Some("User does not exist.")
-        case Some(x) if(x.userName == context.loginAccount.get.userName) => Some("User can access this repository already.")
+        case Some(x) if(x.userName == paths(1) || getCollaborators(paths(1), paths(2)).contains(x.userName))
-        case Some(x) => {
+                  => Some("User can access this repository already.")
-          val paths = request.getRequestURI.split("/")
+        case _    => None
-          if(getCollaborators(paths(1), paths(2)).contains(x.userName)){
-            Some("User can access this repository already.")
-          } else {
-            None
-          }
-        }
       }
     }
   }

src/main/scala/app/RepositoryViewerController.scala

@@ -27,8 +27,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     contentType = "text/html"
     view.helpers.markdown(params("content"), repository,
       params("enableWikiLink").toBoolean,
-      params("enableCommitLink").toBoolean,
+      params("enableRefsLink").toBoolean)
-      params("enableIssueLink").toBoolean)
   })
 
   /**
@@ -58,13 +57,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/commits/:branch")(referrersOnly { repository =>
     val branchName = params("branch")
     val page       = params.getOrElse("page", "1").toInt
-
     JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      val (logs, hasNext) = JGitUtil.getCommitLog(git, branchName, page, 30)
+      JGitUtil.getCommitLog(git, branchName, page, 30) match {
-
+        case Right((logs, hasNext)) =>
-      repo.html.commits(Nil, branchName, repository, logs.splitWith{ (commit1, commit2) =>
+          repo.html.commits(Nil, branchName, repository, logs.splitWith{ (commit1, commit2) =>
-        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+            view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-      }, page, hasNext)
+          }, page, hasNext)
+        case Left(_) => NotFound
+      }
     }
   })
   
@@ -77,12 +77,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val page       = params.getOrElse("page", "1").toInt
 
     JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      val (logs, hasNext) = JGitUtil.getCommitLog(git, branchName, page, 30, path)
+      JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
-
+        case Right((logs, hasNext)) =>
-      repo.html.commits(path.split("/").toList, branchName, repository,
+          repo.html.commits(path.split("/").toList, branchName, repository,
-        logs.splitWith{ (commit1, commit2) =>
+            logs.splitWith{ (commit1, commit2) =>
-          view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+              view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-        }, page, hasNext)
+            }, page, hasNext)
+        case Left(_) => NotFound
+      }
     }
   })
 
@@ -210,40 +212,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * @return HTML of the file list
    */
   private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
-    getRepository(repository.owner, repository.name, baseUrl).map { repositoryInfo =>
+    if(repository.commitCount == 0){
-      val revision = if(revstr.isEmpty){
+      repo.html.guide(repository)
-        repositoryInfo.repository.defaultBranch
+    } else {
-      } else {
+      JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-        revstr
+        val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
+        // get specified commit
+        revisions.map { rev => (git.getRepository.resolve(rev), rev)}.find(_._1 != null).map { case (objectId, revision) =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
+
+          // get files
+          val files = JGitUtil.getFileList(git, revision, path)
+          // process README.md
+          val readme = files.find(_.name == "README.md").map { file =>
+            new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
+          }
+
+          repo.html.files(revision, repository,
+            if(path == ".") Nil else path.split("/").toList, // current path
+            new JGitUtil.CommitInfo(revCommit), // latest commit
+            files, readme)
+        } getOrElse NotFound
       }
-
+    }
-      JGitUtil.withGit(getRepositoryDir(repositoryInfo.owner, repositoryInfo.name)){ git =>
-      // get latest commit
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
-
-        val files = JGitUtil.getFileList(git, revision, path)
-
-        // process README.md
-        val readme = files.find(_.name == "README.md").map { file =>
-          new String(JGitUtil.getContent(Git.open(getRepositoryDir(repositoryInfo.owner, repositoryInfo.name)), file.id, true).get, "UTF-8")
-        }
-
-        repo.html.files(
-          // current branch
-          revision,
-          // repository
-          repositoryInfo,
-          // current path
-          if(path == ".") Nil else path.split("/").toList,
-          // latest commit
-          new JGitUtil.CommitInfo(revCommit),
-          // file list
-          files,
-          // readme
-          readme
-        )
-      }
-    } getOrElse NotFound
   }
   
 }

src/main/scala/app/SignInController.scala

@@ -25,7 +25,7 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
 
   post("/signin", form){ form =>
     val account = getAccountByUserName(form.userName)
-    if(account.isEmpty || account.get.password != encrypt(form.password)){
+    if(account.isEmpty || account.get.password != sha1(form.password)){
       redirect("/signin")
     } else {
       session.setAttribute("LOGIN_ACCOUNT", account.get)
@@ -35,7 +35,7 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
         session.removeAttribute("REDIRECT")
         redirect(redirectUrl.asInstanceOf[String])
       }.getOrElse {
-        redirect("/%s".format(account.get.userName))
+        redirect("/")
       }
     }
   }

src/main/scala/app/SystemSettingsController.scala

@@ -4,11 +4,12 @@ import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
 import jp.sf.amateras.scalatra.forms._
+import org.scalatra.FlashMapSupport
 
 class SystemSettingsController extends SystemSettingsControllerBase
   with SystemSettingsService with AccountService with AdminAuthenticator
 
-trait SystemSettingsControllerBase extends ControllerBase {
+trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
   self: SystemSettingsService with AccountService with AdminAuthenticator =>
 
   private case class SystemSettingsForm(allowAccountRegistration: Boolean)
@@ -19,11 +20,12 @@ trait SystemSettingsControllerBase extends ControllerBase {
 
 
   get("/admin/system")(adminOnly {
-    admin.html.system(loadSystemSettings())
+    admin.html.system(loadSystemSettings(), flash.get("info"))
   })
 
   post("/admin/system", form)(adminOnly { form =>
     saveSystemSettings(SystemSettings(form.allowAccountRegistration))
+    flash += "info" -> "System settings has been updated."
     redirect("/admin/system")
   })
 

src/main/scala/app/UserManagementController.scala

@@ -1,23 +1,31 @@
 package app
 
 import service._
-import util.AdminAuthenticator
+import util.{FileUploadUtil, FileUtil, AdminAuthenticator}
 import util.StringUtil._
 import jp.sf.amateras.scalatra.forms._
+import org.apache.commons.io.FileUtils
+import util.Directory._
+import scala.Some
 
 class UserManagementController extends UserManagementControllerBase with AccountService with AdminAuthenticator
 
-trait UserManagementControllerBase extends ControllerBase { self: AccountService with AdminAuthenticator =>
+trait UserManagementControllerBase extends AccountManagementControllerBase {
+  self: AccountService with AdminAuthenticator =>
   
-  case class UserNewForm(userName: String, password: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
+  case class UserNewForm(userName: String, password: String, mailAddress: String, isAdmin: Boolean,
-  case class UserEditForm(userName: String, password: Option[String], mailAddress: String, isAdmin: Boolean, url: Option[String])
+                         url: Option[String], fileId: Option[String])
+
+  case class UserEditForm(userName: String, password: Option[String], mailAddress: String, isAdmin: Boolean,
+                          url: Option[String], fileId: Option[String], clearImage: Boolean)
 
   val newForm = mapping(
     "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
     "isAdmin"     -> trim(label("User Type"    , boolean())),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200)))))
+    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      , optional(text())))
   )(UserNewForm.apply)
 
   val editForm = mapping(
@@ -25,7 +33,9 @@ trait UserManagementControllerBase extends ControllerBase { self: AccountService
     "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
     "isAdmin"     -> trim(label("User Type"    , boolean())),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200)))))
+    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  , boolean()))
   )(UserEditForm.apply)
   
   get("/admin/users")(adminOnly {
@@ -37,7 +47,8 @@ trait UserManagementControllerBase extends ControllerBase { self: AccountService
   })
   
   post("/admin/users/_new", newForm)(adminOnly { form =>
-    createAccount(form.userName, encrypt(form.password), form.mailAddress, form.isAdmin, form.url)
+    createAccount(form.userName, sha1(form.password), form.mailAddress, form.isAdmin, form.url)
+    updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
   
@@ -50,27 +61,15 @@ trait UserManagementControllerBase extends ControllerBase { self: AccountService
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       updateAccount(getAccountByUserName(userName).get.copy(
-        password     = form.password.map(encrypt).getOrElse(account.password),
+        password     = form.password.map(sha1).getOrElse(account.password),
         mailAddress  = form.mailAddress,
         isAdmin      = form.isAdmin,
         url          = form.url))
 
+      updateImage(userName, form.fileId, form.clearImage)
       redirect("/admin/users")
+
     } getOrElse NotFound
   })
-
-  // TODO Merge with AccountController?
-  private def uniqueUserName: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      getAccountByUserName(value).map { _ => "User already exists." }
-  }
-
-  // TODO Merge with AccountController?
-  private def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      getAccountByMailAddress(value)
-        .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
-        .map    { _ => "Mail address is already registered." }
-  }
   
 }

src/main/scala/app/WikiController.scala

@@ -1,27 +1,29 @@
 package app
 
 import service._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, JGitUtil}
+import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, JGitUtil, StringUtil}
 import util.Directory._
 import jp.sf.amateras.scalatra.forms._
 
 class WikiController extends WikiControllerBase 
-  with WikiService with RepositoryService with AccountService with CollaboratorsAuthenticator with ReferrerAuthenticator
+  with WikiService with RepositoryService with AccountService with ActivityService
+  with CollaboratorsAuthenticator with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with CollaboratorsAuthenticator with ReferrerAuthenticator =>
+  self: WikiService with RepositoryService with ActivityService
+    with CollaboratorsAuthenticator with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String)
   
   val newForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), identifier, unique))),
+    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename, unique))),
     "content"         -> trim(label("Content"            , text(required))),
     "message"         -> trim(label("Message"            , optional(text()))),
     "currentPageName" -> trim(label("Current page name"  , text()))
   )(WikiPageEditForm.apply)
   
   val editForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), identifier))),
+    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename))),
     "content"         -> trim(label("Content"            , text(required))),
     "message"         -> trim(label("Message"            , optional(text()))),
     "currentPageName" -> trim(label("Current page name"  , text(required)))
@@ -30,27 +32,30 @@ 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))
-    } getOrElse redirect("/%s/%s/wiki/Home/_edit".format(repository.owner, repository.name))
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
   
   get("/:owner/:repository/wiki/:page")(referrersOnly { repository =>
-    val pageName = params("page")
+    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))
-    } getOrElse redirect("/%s/%s/wiki/%s/_edit".format(repository.owner, repository.name, pageName)) // TODO URLEncode
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${pageName}/_edit") // TODO URLEncode
   })
   
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
-    val pageName = params("page")
+    val pageName = StringUtil.urlDecode(params("page"))
 
     JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.history(Some(pageName), JGitUtil.getCommitLog(git, "master", path = pageName + ".md")._1, repository)
+      JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
+        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
+        case Left(_) => NotFound
+      }
     }
   })
   
   get("/:owner/:repository/wiki/:page/_compare/:commitId")(referrersOnly { repository =>
-    val pageName = params("page")
+    val pageName = StringUtil.urlDecode(params("page"))
     val commitId = params("commitId").split("\\.\\.\\.")
 
     JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
@@ -67,16 +72,20 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
-    val pageName = params("page")
+    val pageName = StringUtil.urlDecode(params("page"))
     wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
+    val loginAccount = context.loginAccount.get
+    
     saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-        form.content, context.loginAccount.get, form.message.getOrElse(""))
+        form.content, loginAccount, form.message.getOrElse(""))
+    
     updateLastActivityDate(repository.owner, repository.name)
+    recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
 
-    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -84,20 +93,24 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
+    val loginAccount = context.loginAccount.get
+    
     saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
         form.content, context.loginAccount.get, form.message.getOrElse(""))
+    
     updateLastActivityDate(repository.owner, repository.name)
+    recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
 
-    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
   })
   
   get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
-    val pageName = params("page")
+      val pageName = StringUtil.urlDecode(params("page"))
     
-    deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName))
+    deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, s"Delete ${pageName}")
     updateLastActivityDate(repository.owner, repository.name)
 
-    redirect("/%s/%s/wiki".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/wiki")
   })
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
@@ -107,7 +120,10 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
     JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.history(None, JGitUtil.getCommitLog(git, "master")._1, repository)
+      JGitUtil.getCommitLog(git, "master") match {
+        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
+        case Left(_) => NotFound
+      }
     }
   })
 
@@ -123,4 +139,16 @@ trait WikiControllerBase extends ControllerBase {
       getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")
   }
 
+  private def pagename: Constraint = new Constraint(){
+    def validate(name: String, value: String): Option[String] =
+      if(value.exists("\\/:*?\"<>|".contains(_))){
+        Some(s"${name} contains invalid character.")
+      } else if(value.startsWith("_") || value.startsWith("-")){
+        Some(s"${name} starts with invalid character.")
+      } else {
+        None
+      }
+  }
+
+
 }

src/main/scala/model/Account.scala

@@ -2,7 +2,7 @@ package model
 
 import scala.slick.driver.H2Driver.simple._
 
-object Accounts extends Table[Account]("ACCOUNT") with Functions {
+object Accounts extends Table[Account]("ACCOUNT") {
   def userName = column[String]("USER_NAME", O PrimaryKey)
   def mailAddress = column[String]("MAIL_ADDRESS")
   def password = column[String]("PASSWORD")
@@ -11,7 +11,8 @@ object Accounts extends Table[Account]("ACCOUNT") with Functions {
   def registeredDate = column[java.util.Date]("REGISTERED_DATE")
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
   def lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
-  def * = userName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> (Account, Account.unapply _)
+  def image = column[String]("IMAGE")
+  def * = userName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? <> (Account, Account.unapply _)
 }
 
 case class Account(
@@ -22,5 +23,6 @@ case class Account(
     url: Option[String],
     registeredDate: java.util.Date,
     updatedDate: java.util.Date,
-    lastLoginDate: Option[java.util.Date]
+    lastLoginDate: Option[java.util.Date],
+    image: Option[String]
 )

src/main/scala/model/Activity.scala

@@ -0,0 +1,31 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate {
+  def activityId = column[Int]("ACTIVITY_ID", O AutoInc)
+  def activityUserName = column[String]("ACTIVITY_USER_NAME")
+  def activityType = column[String]("ACTIVITY_TYPE")
+  def message = column[String]("MESSAGE")
+  def additionalInfo = column[String]("ADDITIONAL_INFO")
+  def activityDate = column[java.util.Date]("ACTIVITY_DATE")
+  def * = activityId ~ userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate <> (Activity, Activity.unapply _)
+  def autoInc = userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate returning activityId
+}
+
+object CommitLog extends Table[(String, String, String)]("COMMIT_LOG") with BasicTemplate {
+  def commitId = column[String]("COMMIT_ID")
+  def * = userName ~ repositoryName ~ commitId
+  def byPrimaryKey(userName: String, repositoryName: String, commitId: String) = byRepository(userName, repositoryName) && (this.commitId is commitId.bind)
+}
+
+case class Activity(
+  activityId: Int,
+  userName: String,
+  repositoryName: String,
+  activityUserName: String,
+  activityType: String,
+  message: String,
+  additionalInfo: Option[String],
+  activityDate: java.util.Date
+)

src/main/scala/model/Issue.scala

@@ -7,7 +7,7 @@ object IssueId extends Table[(String, String, Int)]("ISSUE_ID") with IssueTempla
   def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
 }
 
-object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate with Functions {
+object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate {
   def openedUserName = column[String]("OPENED_USER_NAME")
   def assignedUserName = column[String]("ASSIGNED_USER_NAME")
   def title = column[String]("TITLE")

src/main/scala/model/IssueComment.scala

@@ -2,16 +2,16 @@ package model
 
 import scala.slick.driver.H2Driver.simple._
 
-object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate with Functions {
+object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate {
   def commentId = column[Int]("COMMENT_ID", O AutoInc)
   def action = column[String]("ACTION")
   def commentedUserName = column[String]("COMMENTED_USER_NAME")
   def content = column[String]("CONTENT")
   def registeredDate = column[java.util.Date]("REGISTERED_DATE")
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
+  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
 
-  def autoInc = userName ~ repositoryName ~ issueId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
+  def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
   def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
 }
 
@@ -20,7 +20,7 @@ case class IssueComment(
     repositoryName: String,
     issueId: Int,
     commentId: Int,
-    action: Option[String],
+    action: String,
     commentedUserName: String,
     content: String,
     registeredDate: java.util.Date,

src/main/scala/model/Milestone.scala

@@ -2,7 +2,7 @@ package model
 
 import scala.slick.driver.H2Driver.simple._
 
-object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate with Functions {
+object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate {
   def title = column[String]("TITLE")
   def description = column[String]("DESCRIPTION")
   def dueDate = column[java.util.Date]("DUE_DATE")

src/main/scala/model/Repository.scala

@@ -2,7 +2,7 @@ package model
 
 import scala.slick.driver.H2Driver.simple._
 
-object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate with Functions {
+object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
   def isPrivate = column[Boolean]("PRIVATE")
   def description = column[String]("DESCRIPTION")
   def defaultBranch = column[String]("DEFAULT_BRANCH")

src/main/scala/model/package.scala

@@ -1,8 +1,6 @@
-package model
+package object model {
+  import scala.slick.lifted.MappedTypeMapper
 
-import scala.slick.lifted.MappedTypeMapper
-
-protected[model] trait Functions {
   // java.util.Date TypeMapper
   implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
       d => new java.sql.Timestamp(d.getTime),

src/main/scala/service/AccountService.scala

@@ -1,7 +1,6 @@
 package service
 
 import model._
-import Accounts._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 
@@ -24,7 +23,8 @@ trait AccountService {
       url            = url,
       registeredDate = currentDate,
       updatedDate    = currentDate,
-      lastLoginDate  = None)
+      lastLoginDate  = None,
+      image          = None)
 
   def updateAccount(account: Account): Unit = 
     Accounts
@@ -38,7 +38,10 @@ trait AccountService {
         account.registeredDate,
         currentDate,
         account.lastLoginDate)
-  
+
+  def updateAvatarImage(userName: String, image: Option[String]): Unit =
+    Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
+
   def updateLastLoginDate(userName: String): Unit =
     Accounts.filter(_.userName is userName.bind).map(_.lastLoginDate).update(currentDate)
   

src/main/scala/service/ActivityService.scala

@@ -0,0 +1,115 @@
+package service
+
+import model._
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+
+trait ActivityService {
+
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = {
+    val q = Query(Activities)
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+
+    (if(isPublic){
+      q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) }
+    } else {
+      q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind }
+    })
+    .sortBy { case (t1, t2) => t1.activityId desc }
+    .map    { case (t1, t2) => t1 }
+    .take(30)
+    .list
+  }
+  
+  def getRecentActivities(): List[Activity] =
+    Query(Activities)
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) => t2.isPrivate is false.bind }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
+  
+
+  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "create_repository",
+      s"[user:${activityUserName}] created [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+
+  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "open_issue",
+      s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
+      Some(title), 
+      currentDate)
+
+  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "close_issue",
+      s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate)
+
+  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "reopen_issue",
+      s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate)
+
+  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "comment_issue",
+      s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
+      Some(cut(comment, 200)),
+      currentDate)
+  
+  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "create_wiki",
+      s"[user:${activityUserName}] created the [repo:${userName}/${repositoryName}] wiki",
+      Some(pageName),
+      currentDate)
+  
+  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "edit_wiki",
+      s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
+      Some(pageName),
+      currentDate)
+  
+  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String, 
+      branchName: String, commits: List[util.JGitUtil.CommitInfo]) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "push",
+      s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
+      currentDate)
+  
+  def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String, 
+      tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "create_tag",
+      s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+  
+  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "create_tag",
+      s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+  
+  def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
+    CommitLog insert (userName, repositoryName, commitId)
+  }
+  
+  def existsCommitId(userName: String, repositoryName: String, commitId: String): Boolean =
+    Query(CommitLog).filter(_.byPrimaryKey(userName, repositoryName, commitId)).firstOption.isDefined
+  
+  private def cut(value: String, length: Int): String = 
+    if(value.length > length) value.substring(0, length) + "..." else value
+}

src/main/scala/service/IssuesService.scala

@@ -6,7 +6,7 @@ import scala.slick.jdbc.{StaticQuery => Q}
 import Q.interpolation
 
 import model._
-import Issues._
+import util.StringUtil._
 import util.Implicits._
 
 trait IssuesService {
@@ -36,6 +36,9 @@ trait IssuesService {
       .map    ( _._2 )
       .list
 
+  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
+    Query(IssueLabels) filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
+
   /**
    * Returns the count of the search result against  issues.
    *
@@ -99,7 +102,10 @@ trait IssuesService {
     // get issues and comment count
     val issues = searchIssueQuery(owner, repository, condition, filter, userName)
       .leftJoin(Query(IssueComments)
-        .filter  { _.byRepository(owner, repository) }
+        .filter  { t =>
+          (t.byRepository(owner, repository)) &&
+          (t.action inSetBind Seq("comment", "close_comment", "reopen_comment"))
+        }
         .groupBy { _.issueId }
         .map     { case (issueId, t) => issueId ~ t.length }).on((t1, t2) => t1.issueId is t2._1)
       .sortBy { case (t1, t2) =>
@@ -189,7 +195,7 @@ trait IssuesService {
     IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
 
   def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: Option[String]) =
+      issueId: Int, content: String, action: String) =
     IssueComments.autoInc insert (
         owner,
         repository,
@@ -234,7 +240,6 @@ trait IssuesService {
 }
 
 object IssuesService {
-  import java.net.URLEncoder
   import javax.servlet.http.HttpServletRequest
 
   val IssueLimit = 30
@@ -246,8 +251,6 @@ object IssuesService {
       sort: String = "created",
       direction: String = "desc"){
 
-    import IssueSearchCondition._
-
     def toURL: String =
       "?" + List(
         if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
@@ -263,8 +266,6 @@ object IssuesService {
 
   object IssueSearchCondition {
 
-    private def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8")
-
     private def param(request: HttpServletRequest, name: String, allow: Seq[String] = Nil): Option[String] = {
       val value = request.getParameter(name)
       if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)

src/main/scala/service/MilestonesService.scala

@@ -4,7 +4,6 @@ import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 
 import model._
-import Milestones._
 
 trait MilestonesService {
 

src/main/scala/service/RepositoryService.scala

@@ -1,7 +1,6 @@
 package service
 
 import model._
-import Repositories._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 import util.JGitUtil
@@ -12,19 +11,17 @@ trait RepositoryService { self: AccountService =>
   /**
    * Creates a new repository.
    *
-   * The project is created as public repository at first. Users can modify the project type at the repository settings
-   * page after the project creation to configure the project as the private repository.
-   *
    * @param repositoryName the repository name
    * @param userName the user name of the repository owner
    * @param description the repository description
+   * @param isPrivate the repository type (private is true, otherwise false)
    */
-  def createRepository(repositoryName: String, userName: String, description: Option[String]): Unit = {
+  def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean): Unit = {
     Repositories insert
       Repository(
         userName         = userName,
         repositoryName   = repositoryName,
-        isPrivate        = false,
+        isPrivate        = isPrivate,
         description      = description,
         defaultBranch    = "master",
         registeredDate   = currentDate,
@@ -35,6 +32,8 @@ trait RepositoryService { self: AccountService =>
   }
 
   def deleteRepository(userName: String, repositoryName: String): Unit = {
+    Activities    .filter(_.byRepository(userName, repositoryName)).delete
+    CommitLog     .filter(_.byRepository(userName, repositoryName)).delete
     Collaborators .filter(_.byRepository(userName, repositoryName)).delete
     IssueLabels   .filter(_.byRepository(userName, repositoryName)).delete
     Labels        .filter(_.byRepository(userName, repositoryName)).delete
@@ -83,8 +82,7 @@ trait RepositoryService { self: AccountService =>
     }
 
     q1.union(q2).filter(visibleFor(_, loginUserName)).sortBy(_.lastActivityDate desc).list map { repository =>
-      val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
-      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
     }
   }
 
@@ -98,8 +96,7 @@ trait RepositoryService { self: AccountService =>
    */
   def getRepository(userName: String, repositoryName: String, baseUrl: String): Option[RepositoryInfo] = {
     (Query(Repositories) filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
-      val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
-      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
     }
   }
 
@@ -112,9 +109,8 @@ trait RepositoryService { self: AccountService =>
    */
   def getAccessibleRepositories(account: Option[Account], baseUrl: String): List[RepositoryInfo] = {
 
-    def createRepositoryInfo(repository: Repository): RepositoryInfo = {
+    def newRepositoryInfo(repository: Repository): RepositoryInfo = {
-      val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
-      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
     }
 
     (account match {
@@ -127,7 +123,7 @@ trait RepositoryService { self: AccountService =>
         }
       // for Guests
       case None => Query(Repositories) filter(_.isPrivate is false.bind)
-    }).sortBy(_.lastActivityDate desc).list.map(createRepositoryInfo _)
+    }).sortBy(_.lastActivityDate desc).list.map(newRepositoryInfo _)
   }
 
   /**
@@ -189,6 +185,12 @@ trait RepositoryService { self: AccountService =>
 object RepositoryService {
 
   case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository,
-                            branchList: List[String], tags: List[util.JGitUtil.TagInfo])
+    commitCount: Int, branchList: List[String], tags: List[util.JGitUtil.TagInfo]){
+
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository) = {
+      this(repo.owner, repo.name, repo.url, model, repo.commitCount, repo.branchList, repo.tags)
+    }
+
+  }
 
 }

src/main/scala/service/RequestCache.scala

@@ -0,0 +1,26 @@
+package service
+
+import model._
+
+/**
+ * This service is used for a view helper mainly.
+ *
+ * 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 {
+
+  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)
+    }
+  }
+
+  def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
+    context.cache(s"account.${userName}"){
+      new AccountService {}.getAccountByUserName(userName)
+    }
+  }
+
+}
+

src/main/scala/service/WikiService.scala

@@ -68,12 +68,10 @@ trait WikiService {
     lock(owner.userName, repository){
       val dir = Directory.getWikiRepositoryDir(owner.userName, repository)
       if(!dir.exists){
-        val repo = new RepositoryBuilder().setGitDir(dir).setBare.build
         try {
-          repo.create
+          JGitUtil.initRepository(dir)
-          saveWikiPage(owner.userName, repository, "Home", "Home", "Welcome to the %s wiki!!".format(repository), owner, "Initial Commit")
+          saveWikiPage(owner.userName, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", owner, "Initial Commit")
         } finally {
-          repo.close
           // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
           FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner.userName, repository))
         }

src/main/scala/servlet/AutoUpdateListener.scala

@@ -25,7 +25,7 @@ object AutoUpdate {
      * If corresponding SQL file does not exist, this method do nothing.
      */
     def update(conn: Connection): Unit = {
-      val sqlPath = "update/%d_%d.sql".format(majorVersion, minorVersion)
+      val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
       val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)
       if(in != null){
         val sql = IOUtils.toString(in, "UTF-8")
@@ -42,15 +42,33 @@ object AutoUpdate {
     /**
      * MAJOR.MINOR
      */
-    val versionString = "%d.%d".format(majorVersion, minorVersion)
+    val versionString = s"${majorVersion}.${minorVersion}"
   }
-  
+
   /**
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
-      Version(1, 1),
+    new Version(1, 3){
-      Version(1, 0)
+      override def update(conn: Connection): Unit = {
+        super.update(conn)
+        // Fix wiki repository configuration
+        val rs = conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")
+        while(rs.next){
+          val wikidir = Directory.getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))
+          val repository = org.eclipse.jgit.api.Git.open(wikidir).getRepository
+          val config = repository.getConfig
+          if(!config.getBoolean("http", "receivepack", false)){
+            config.setBoolean("http", null, "receivepack", true)
+            config.save
+          }
+          repository.close
+        }
+      }
+    },
+    Version(1, 2),
+    Version(1, 1),
+    Version(1, 0)
   )
   
   /**

src/main/scala/servlet/BasicAuthenticationFilter.scala

@@ -21,6 +21,10 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
     val request  = req.asInstanceOf[HttpServletRequest]
     val response = res.asInstanceOf[HttpServletResponse]
 
+    val wrappedResponse = new HttpServletResponseWrapper(response){
+      override def setCharacterEncoding(encoding: String) = {}
+    }
+
     try {
       val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
       val repositoryOwner = paths(2)
@@ -29,14 +33,14 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
       getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki", ""), "") match {
         case Some(repository) => {
           if(!request.getRequestURI.endsWith("/git-receive-pack") && !repository.repository.isPrivate){
-            chain.doFilter(req, res)
+            chain.doFilter(req, wrappedResponse)
           } else {
             request.getHeader("Authorization") match {
               case null => requireAuth(response)
               case auth => decodeAuthHeader(auth).split(":") match {
                 case Array(username, password) if(isWritableUser(username, password, repository)) => {
                   request.setAttribute("USER_NAME", username)
-                  chain.doFilter(req, res)
+                  chain.doFilter(req, wrappedResponse)
                 }
                 case _ => requireAuth(response)
               }
@@ -55,7 +59,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
 
   private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean = {
     getAccountByUserName(username).map { account =>
-      account.password == encrypt(password) && hasWritePermission(repository.owner, repository.name, Some(account))
+      account.password == sha1(password) && hasWritePermission(repository.owner, repository.name, Some(account))
     } getOrElse false
   }
   

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -49,7 +49,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
   
   override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
     val receivePack = new ReceivePack(db)
-    val userName = request.getAttribute("USER_NAME")
+    val userName = request.getAttribute("USER_NAME").asInstanceOf[String]
 
     logger.debug("requestURI: " + request.getRequestURI)
     logger.debug("userName:" + userName)
@@ -60,27 +60,52 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
     
     logger.debug("repository:" + owner + "/" + repository)
 
-    receivePack.setPostReceiveHook(new CommitLogHook(owner, repository))
+    receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName))
     receivePack
   }
 }
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String) extends PostReceiveHook
+class CommitLogHook(owner: String, repository: String, userName: String) extends PostReceiveHook
-  with RepositoryService with AccountService with IssuesService {
+  with RepositoryService with AccountService with IssuesService with ActivityService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
   
   def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
     JGitUtil.withGit(Directory.getRepositoryDir(owner, repository)) { git =>
       commands.asScala.foreach { command =>
-        JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name).foreach { commit =>
+        val commits = JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
-          "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
+        val refName = command.getRefName.split("/")
-            val issueId = matchData.group(2)
+        
-            if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
+        // apply issue comment
-              createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, None)
+        val newCommits = commits.flatMap { commit =>
+          if(!existsCommitId(owner, repository, commit.id)){
+            insertCommitId(owner, repository, commit.id)
+            "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
+              val issueId = matchData.group(2)
+              if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
+                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit")
+              }
             }
+            Some(commit)
+          } else None
+        }.toList
+        
+        // record activity
+        if(refName(1) == "heads"){
+          command.getType match {
+            case ReceiveCommand.Type.CREATE => {
+              recordCreateBranchActivity(owner, repository, userName, refName(2))
+              recordPushActivity(owner, repository, userName, refName(2), newCommits)
+            }
+            case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, refName(2), newCommits)
+            case _ =>
+          }
+        } else if(refName(1) == "tags"){
+          command.getType match {
+            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, refName(2), newCommits)
+            case _ =>
           }
         }
       }

src/main/scala/servlet/SessionCleanupListener.scala

@@ -0,0 +1,17 @@
+package servlet
+
+import util.FileUploadUtil
+import javax.servlet.http.{HttpSessionEvent, HttpSessionListener}
+
+/**
+ * Removes session associated temporary files when session is destroyed.
+ */
+class SessionCleanupListener extends HttpSessionListener {
+
+  def sessionCreated(se: HttpSessionEvent): Unit = {}
+
+  def sessionDestroyed(se: HttpSessionEvent): Unit = {
+    FileUploadUtil.removeTemporaryFiles()(se.getSession)
+  }
+
+}

src/main/scala/servlet/TransactionFilter.scala

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest
 import scala.slick.session.Database
 
 /**
- * Controls the transaction with the open session in view pattern.
+ * Controls the transaction with the open session in view pattern.
  */
 class TransactionFilter extends Filter {
   
@@ -21,7 +21,6 @@ class TransactionFilter extends Filter {
       // assets don't need transaction
       chain.doFilter(req, res)
     } else {
-      // TODO begin transaction!
       val context = req.getServletContext
       Database.forURL(context.getInitParameter("db.url"),
           context.getInitParameter("db.user"),

src/main/scala/util/Directory.scala

@@ -13,13 +13,13 @@ object Directory {
 
   val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
   
-  val RepositoryHome = "%s/repositories".format(GitBucketHome)
+  val RepositoryHome = s"${GitBucketHome}/repositories"
   
   /**
    * Repository names of the specified user.
    */
   def getRepositories(owner: String): List[String] = {
-    val dir = new File("%s/%s".format(RepositoryHome, owner))
+    val dir = new File(s"${RepositoryHome}/${owner}")
     if(dir.exists){
       dir.listFiles.filter { file =>
         file.isDirectory && !file.getName.endsWith(".wiki.git") 
@@ -33,19 +33,24 @@ object Directory {
    * Substance directory of the repository.
    */
   def getRepositoryDir(owner: String, repository: String): File =
-    new File("%s/%s/%s.git".format(RepositoryHome, owner, repository))
+    new File(s"${RepositoryHome}/${owner}/${repository}.git")
+
+  /**
+   * Directory for uploaded files by the specified user.
+   */
+  def getUserUploadDir(userName: String): File = new File(s"${GitBucketHome}/data/${userName}/files")
 
   /**
    * Root of temporary directories for the specified repository.
    */
   def getTemporaryDir(owner: String, repository: String): File =
-    new File("%s/tmp/%s/%s".format(GitBucketHome, owner, repository))
+    new File(s"${GitBucketHome}/tmp/${owner}/${repository}")
 
   /**
    * Temporary directory which is used to create an archive to download repository contents.
    */
   def getDownloadWorkDir(owner: String, repository: String, sessionId: String): File = 
-    new File(getTemporaryDir(owner, repository), "download/%s".format(sessionId))
+    new File(getTemporaryDir(owner, repository), s"download/${sessionId}")
   
   /**
    * Temporary directory which is used in the repository creation.
@@ -60,7 +65,7 @@ object Directory {
    * Substance directory of the wiki repository.
    */
   def getWikiRepositoryDir(owner: String, repository: String): File =
-    new File("%s/%s/%s.wiki.git".format(Directory.RepositoryHome, owner, repository))
+    new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git")
   
   /**
    * Wiki working directory which is cloned from the wiki repository.

src/main/scala/util/FileUploadUtil.scala

@@ -0,0 +1,33 @@
+package util
+
+import java.text.SimpleDateFormat
+import javax.servlet.http.HttpSession
+import util.Directory._
+import org.apache.commons.io.FileUtils
+
+object FileUploadUtil {
+
+  def generateFileId: String =
+    new SimpleDateFormat("yyyyMMddHHmmSSsss").format(new java.util.Date(System.currentTimeMillis))
+
+  def TemporaryDir(implicit session: HttpSession): java.io.File =
+    new java.io.File(GitBucketHome, s"tmp/_upload/${session.getId}")
+
+  def getTemporaryFile(fileId: String)(implicit session: HttpSession): java.io.File =
+    new java.io.File(TemporaryDir, fileId)
+
+//  def removeTemporaryFile(fileId: String)(implicit session: HttpSession): Unit =
+//    getTemporaryFile(fileId).delete()
+
+  def removeTemporaryFiles()(implicit session: HttpSession): Unit =
+    FileUtils.deleteDirectory(TemporaryDir)
+
+  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] = {
+    val filename = Option(session.getAttribute("upload_" + fileId).asInstanceOf[String])
+    if(filename.isDefined){
+      session.removeAttribute("upload_" + fileId)
+    }
+    filename
+  }
+
+}

src/main/scala/util/FileUtil.scala

@@ -44,4 +44,13 @@ object FileUtil {
     }
   }
 
+  def getExtension(name: String): String = {
+    val index = name.lastIndexOf('.')
+    if(index >= 0){
+      name.substring(index + 1)
+    } else {
+      ""
+    }
+  }
+
 }

src/main/scala/util/Implicits.scala

@@ -1,14 +1,14 @@
 package util
 
-import twirl.api.Html
 import scala.slick.driver.H2Driver.simple._
+import scala.util.matching.Regex
 
 /**
  * Provides some usable implicit conversions.
  */
 object Implicits {
-  
+
-  implicit def extendsSeq[A](seq: Seq[A]) = new {
+  implicit class RichSeq[A](seq: Seq[A]) {
 
     def splitWith(condition: (A, A) => Boolean): Seq[Seq[A]] = split(seq)(condition)
 
@@ -26,8 +26,27 @@ object Implicits {
   }
 
   // TODO Should this implicit conversion move to model.Functions?
-  implicit def extendsColumn(c1: Column[Boolean]) = new {
+  implicit class RichColumn(c1: Column[Boolean]){
     def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
   }
 
+  implicit class RichString(value: String){
+    def replaceBy(regex: Regex)(replace: Regex.MatchData => Option[String]): String = {
+      val sb = new StringBuilder()
+      var i = 0
+      regex.findAllIn(value).matchData.foreach { m =>
+        sb.append(value.substring(i, m.start))
+        i = m.end
+        replace(m) match {
+          case Some(s) => sb.append(s)
+          case None    => sb.append(m.matched)
+        }
+      }
+      if(i < value.length){
+        sb.append(value.substring(i))
+      }
+      sb.toString
+    }
+  }
+
 }

src/main/scala/util/JGitUtil.scala

@@ -14,6 +14,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType
 import org.eclipse.jgit.util.io.DisabledOutputStream
 import org.eclipse.jgit.errors.MissingObjectException
 import java.util.Date
+import org.eclipse.jgit.api.errors.NoHeadException
 
 /**
  * Provides complex JGit operations.
@@ -26,10 +27,11 @@ object JGitUtil {
    * @param owner the user name of the repository owner
    * @param name the repository name
    * @param url the repository URL
+   * @param commitCount the commit count. If the repository has over 1000 commits then this property is 1001.
    * @param branchList the list of branch names
    * @param tags the list of tags
    */
-  case class RepositoryInfo(owner: String, name: String, url: String, branchList: List[String], tags: List[TagInfo])
+  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo])
 
   /**
    * The file data for the file list of the repository viewer.
@@ -50,14 +52,21 @@ object JGitUtil {
    * @param id the commit id
    * @param time the commit time
    * @param committer  the committer name
+   * @param mailAddress the mail address of the committer
    * @param shortMessage the short message
    * @param fullMessage the full message
    * @param parents the list of parent commit id
    */
-  case class CommitInfo(id: String, time: Date, committer: String, shortMessage: String, fullMessage: String, parents: List[String]){
+  case class CommitInfo(id: String, time: Date, committer: String, mailAddress: String,
+                        shortMessage: String, fullMessage: String, parents: List[String]){
     
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
-        rev.getName, rev.getCommitterIdent.getWhen, rev.getCommitterIdent.getName, rev.getShortMessage, rev.getFullMessage,
+        rev.getName,
+        rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress,
+        rev.getShortMessage,
+        rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
     val summary = {
@@ -141,18 +150,35 @@ object JGitUtil {
    */
   def getRepositoryInfo(owner: String, repository: String, baseUrl: String): RepositoryInfo = {
     withGit(getRepositoryDir(owner, repository)){ git =>
-      RepositoryInfo(
+      try {
-        owner, repository, baseUrl + "/git/%s/%s.git".format(owner, repository),
+        // get commit count
-        // branches
+        val i = git.log.all.call.iterator
-        git.branchList.call.asScala.map { ref =>
+        var commitCount = 0
-          ref.getName.replaceFirst("^refs/heads/", "")
+        while(i.hasNext && commitCount <= 1000){
-        }.toList,
+          i.next
-        // tags
+          commitCount = commitCount + 1
-        git.tagList.call.asScala.map { ref =>
+        }
-          val revCommit = getRevCommitFromId(git, ref.getObjectId)
+
-          TagInfo(ref.getName.replaceFirst("^refs/tags/", ""), revCommit.getCommitterIdent.getWhen, revCommit.getName)
+        RepositoryInfo(
-        }.toList
+          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
-      )
+          // commit count
+          commitCount,
+          // branches
+          git.branchList.call.asScala.map { ref =>
+            ref.getName.replaceFirst("^refs/heads/", "")
+          }.toList,
+          // tags
+          git.tagList.call.asScala.map { ref =>
+            val revCommit = getRevCommitFromId(git, ref.getObjectId)
+            TagInfo(ref.getName.replaceFirst("^refs/tags/", ""), revCommit.getCommitterIdent.getWhen, revCommit.getName)
+          }.toList
+        )
+      } catch {
+        // not initialized
+        case e: NoHeadException => RepositoryInfo(
+          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git", 0, Nil, Nil)
+
+      }
     }
   }
   
@@ -234,7 +260,7 @@ object JGitUtil {
    * @param path filters by this path. default is no filter.
    * @return a tuple of the commit list and whether has next
    */
-  def getCommitLog(git: Git, revision: String, page: Int = 1, limit: Int = 0, path: String = ""): (List[CommitInfo], Boolean) = {
+  def getCommitLog(git: Git, revision: String, page: Int = 1, limit: Int = 0, path: String = ""): Either[String, (List[CommitInfo], Boolean)] = {
     val fixedPage = if(page <= 0) 1 else page
     
     @scala.annotation.tailrec
@@ -248,20 +274,25 @@ object JGitUtil {
       }
     
     val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(revision)))
+    val objectId = git.getRepository.resolve(revision)
-    if(path.nonEmpty){
+    if(objectId == null){
-      revWalk.setRevFilter(new RevFilter(){
+      Left(s"${revision} can't be resolved.")
-        def include(walk: RevWalk, commit: RevCommit): Boolean = {
+    } else {
-          getDiffs(git, commit.getName, false).find(_.newPath == path).nonEmpty
+      revWalk.markStart(revWalk.parseCommit(objectId))
-        }
+      if(path.nonEmpty){
-        override def clone(): RevFilter = this
+        revWalk.setRevFilter(new RevFilter(){
-      })
+          def include(walk: RevWalk, commit: RevCommit): Boolean = {
+            getDiffs(git, commit.getName, false).find(_.newPath == path).nonEmpty
+          }
+          override def clone(): RevFilter = this
+        })
+      }
+
+      val commits = getCommitLog(revWalk.iterator, 0, Nil)
+      revWalk.release
+
+      Right(commits)
     }
-    
-    val commits = getCommitLog(revWalk.iterator, 0, Nil)
-    revWalk.release
-    
-    commits
   }
   
   /**
@@ -483,4 +514,20 @@ object JGitUtil {
     }
   }
 
+  def initRepository(dir: java.io.File): Unit = {
+    val repository = new RepositoryBuilder().setGitDir(dir).setBare.build
+    try {
+      repository.create
+      setReceivePack(repository)
+    } finally {
+      repository.close
+    }
+  }
+
+  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
+    val config = repository.getConfig
+    config.setBoolean("http", null, "receivepack", true)
+    config.save
+  }
+
 }

src/main/scala/util/StringUtil.scala

@@ -1,11 +1,23 @@
 package util
 
+import java.net.{URLDecoder, URLEncoder}
+
 object StringUtil {
 
-  def encrypt(value: String): String = {
+  def sha1(value: String): String = {
     val md = java.security.MessageDigest.getInstance("SHA-1")
     md.update(value.getBytes)
     md.digest.map(b => "%02x".format(b)).mkString
   }
 
+  def md5(value: String): String = {
+    val md = java.security.MessageDigest.getInstance("MD5")
+    md.update(value.getBytes)
+    md.digest.map(b => "%02x".format(b)).mkString
+  }
+
+  def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8")
+
+  def urlDecode(value: String): String = URLDecoder.decode(value, "UTF-8")
+
 }

src/main/scala/util/Validations.scala

@@ -11,9 +11,9 @@ trait Validations {
   def identifier: Constraint = new Constraint(){
     def validate(name: String, value: String): Option[String] =
       if(!value.matches("^[a-zA-Z0-9\\-_]+$")){
-        Some("%s contains invalid character.".format(name))
+        Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
-        Some("%s starts with invalid character.".format(name))
+        Some(s"${name} starts with invalid character.")
       } else {
         None
       }

src/main/scala/view/AvatarImageProvider.scala

@@ -0,0 +1,31 @@
+package view
+
+import service.RequestCache
+import twirl.api.Html
+import util.StringUtil
+
+trait AvatarImageProvider { self: RequestCache =>
+
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  protected def getAvatarImageHtml(userName: String, size: Int,
+      mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
+    val src = getAccountByUserName(userName).collect { case account if(account.image.isEmpty) =>
+      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+    } getOrElse {
+      if(mailAddress.nonEmpty){
+        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
+      } else {
+        s"""${context.path}/${userName}/_avatar"""
+      }
+    }
+    if(tooltip){
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
+    } else {
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" />""")
+    }
+  }
+
+}

src/main/scala/view/LinkConverter.scala

@@ -0,0 +1,33 @@
+package view
+
+import service.RequestCache
+import util.Implicits.RichString
+
+trait LinkConverter { self: RequestCache =>
+
+  /**
+   * Converts issue id, username and commit id to link.
+   */
+  protected def convertRefsLinks(value: String, repository: service.RepositoryService.RepositoryInfo,
+                                 issueIdPrefix: String =  "#")(implicit context: app.Context): String = {
+    value
+      // escape HTML tags
+      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+      // convert issue id to link
+      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
+          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+        } else {
+          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+        }
+      }
+      // convert @username to link
+      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+        getAccountByUserName(m.group(2)).map { _ =>
+          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+        }
+      }
+      // convert commit id to link
+      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+  }
+}

src/main/scala/view/Markdown.scala

@@ -1,10 +1,12 @@
 package view
 
+import util.StringUtil
 import org.parboiled.common.StringUtils
 import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
 import scala.collection.JavaConverters._
+import service.RequestCache
 
 object Markdown {
 
@@ -12,12 +14,17 @@ object Markdown {
    * Converts Markdown of Wiki pages to HTML.
    */
   def toHtml(markdown: String, repository: service.RepositoryService.RepositoryInfo,
-             enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): String = {
+             enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
+    // escape issue id
+    val source = if(enableRefsLink){
+      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+    } else markdown
+
     val rootNode = new PegDownProcessor(
       Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
-    ).parseMarkdown(markdown.toCharArray)
+    ).parseMarkdown(source.toCharArray)
 
-    new GitBucketHtmlSerializer(markdown, context, repository, enableWikiLink, enableCommitLink, enableIssueLink).toHtml(rootNode)
+    new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
   }
 }
 
@@ -33,11 +40,10 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
         } else {
           (text, text)
         }
-        val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") +
+        val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
-          "/wiki/" + java.net.URLEncoder.encode(page.replace(' ', '-'), "UTF-8")
         new Rendering(url, label)
       } catch {
-        case e: java.io.UnsupportedEncodingException => throw new IllegalStateException();
+        case e: java.io.UnsupportedEncodingException => throw new IllegalStateException
       }
     } else {
       super.render(node)
@@ -64,24 +70,13 @@ class GitBucketVerbatimSerializer extends VerbatimSerializer {
 
 class GitBucketHtmlSerializer(
     markdown: String,
-    context: app.Context,
     repository: service.RepositoryService.RepositoryInfo,
     enableWikiLink: Boolean,
-    enableCommitLink: Boolean,
+    enableRefsLink: Boolean
-    enableIssueLink: Boolean
+  )(implicit val context: app.Context) extends ToHtmlSerializer(
-  ) extends ToHtmlSerializer(
     new GitBucketLinkRender(context, repository, enableWikiLink),
     Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava
-  ) {
+  ) with LinkConverter with RequestCache {
-
-  override def toHtml(rootNode: RootNode): String = {
-    val html = super.toHtml(rootNode)
-    if(enableIssueLink){
-      // convert marked issue id to link.
-      html.replaceAll("#\\{\\{\\{\\{(\\d+)\\}\\}\\}\\}",
-        "<a href=\"%s/%s/%s/issues/$1\">#$1</a>".format(context.path, repository.owner, repository.name))
-    } else html
-  }
 
   override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
     printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
@@ -108,30 +103,13 @@ class GitBucketHtmlSerializer(
   }
 
   override def visit(node: TextNode) {
-    // convert commit id to link.
+    // convert commit id and username to link.
-    val text1 = if(enableCommitLink) node.getText.replaceAll("(^|\\W)([0-9a-f]{40})(\\W|$)",
+    val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
-      "<a href=\"%s/%s/%s/commit/$2\">$2</a>".format(context.path, repository.owner, repository.name))
-    else node.getText
-
-    // mark issue id to link
-    val startIndex = node.getStartIndex
-    val text2 = if(enableIssueLink && startIndex > 0 && markdown.charAt(startIndex - 1) == '#'){
-      text1.replaceFirst("^(\\d+)(\\W|$)", "{{{{$1}}}}")
-    } else text1
 
     if (abbreviations.isEmpty) {
-      printer.print(text2)
+      printer.print(text)
     } else {
-      printWithAbbreviations(text2)
+      printWithAbbreviations(text)
-    }
-  }
-
-  override def visit(node: HeaderNode) {
-    if(enableIssueLink && markdown.substring(node.getStartIndex, node.getEndIndex - 1).startsWith("#")){
-      printer.print("#" * node.getLevel)
-      visitChildren(node)
-    } else {
-      printTag(node, "h" + node.getLevel)
     }
   }
 

src/main/scala/view/helpers.scala

@@ -2,11 +2,13 @@ package view
 import java.util.Date
 import java.text.SimpleDateFormat
 import twirl.api.Html
+import util.StringUtil
+import service.RequestCache
 
 /**
  * Provides helper methods for Twirl templates.
  */
-object helpers {
+object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
   
   /**
    * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
@@ -29,39 +31,62 @@ object helpers {
    * Converts Markdown of Wiki pages to HTML.
    */
   def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): Html = {
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
-    Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
+    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
   }
 
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
+    getAvatarImageHtml(userName, size, "", tooltip)
+
+  def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
+    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+
+  /**
+   * Converts commit id, issue id and username to the link.
+   */
+  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
+    Html(convertRefsLinks(value, repository))
+
+  def activityMessage(message: String)(implicit context: app.Context): Html =
+    Html(message
+      .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
+      .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]"             , s"""<a href="${context.path}/$$1/$$2\">$$1/$$2</a>""")
+      .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
+      .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
+      .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</a>""")
+    )
+
+  def urlEncode(value: String): String = StringUtil.urlEncode(value)
+
+  def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("")
+
   /**
    * Generates the url to the repository.
    */
   def url(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String =
-    "%s/%s/%s".format(context.path, repository.owner, repository.name)
+    s"${context.path}/${repository.owner}/${repository.name}"
 
   /**
    * Generates the url to the account page.
    */
-  def url(userName: String)(implicit context: app.Context): String = "%s/%s".format(context.path, userName)
+  def url(userName: String)(implicit context: app.Context): String =
+    s"${context.path}/${userName}"
 
   /**
    * Returns the url to the root of assets.
    */
-  def assets(implicit context: app.Context): String = "%s/assets".format(context.path)
+  def assets(implicit context: app.Context): String =
+    s"${context.path}/assets"
+
 
   /**
-   * Converts issue id and commit id to link.
+   * Implicit conversion to add mkHtml() to Seq[Html].
    */
-  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
+  implicit class RichHtmlSeq(seq: Seq[Html]) {
-    Html(value
-      // escape HTML tags
-      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
-      // convert issue id to link
-      .replaceAll("(^|\\W)#(\\d+)(\\W|$)", "$1<a href=\"%s/%s/%s/issues/$2\">#$2</a>$3".format(context.path, repository.owner, repository.name))
-      // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", "$1<a href=\"%s/%s/%s/commit/$2\">$2</a>$3").format(context.path, repository.owner, repository.name))
-
-  implicit def extendsHtmlSeq(seq: Seq[Html]) = new {
     def mkHtml(separator: String) = Html(seq.mkString(separator))
     def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString))
   }

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

@@ -0,0 +1,23 @@
+@(account: model.Account, activities: List[model.Activity])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(account.userName){
+  <div class="container-fluid">
+    <div class="row-fluid">
+      <div class="span4">
+        <div class="block">
+          <div class="account-image">@avatar(account.userName, 200)</div>
+          <div class="block-header">@account.userName</div>
+        </div>
+        <div class="block">
+          <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
+          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+        </div>
+      </div>
+      <div class="span8">
+        @tab(account, "activity")
+        @helper.html.activities(activities)
+      </div>
+    </div>
+  </div>
+}

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

@@ -1,4 +1,4 @@
-@(account: Option[model.Account])(implicit context: app.Context)
+@(account: Option[model.Account], info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main((if(account.isDefined) "Edit your profile" else "Create your account")){
@@ -7,34 +7,45 @@
   } else {
     <h3>Create your account</h3>
   }
+  @helper.html.information(info)
   <form action="@if(account.isDefined){@url(account.get.userName)/_edit}else{@path/register}" method="POST" validate="true">
-    @if(account.isEmpty){
+    <div class="row-fluid">
-      <fieldset>
+      <div class="span6">
-        <label for="userName"><strong>User name</strong></label>
+        @if(account.isEmpty){
-        <input type="text" name="userName" id="userName" value=""/>
+          <fieldset>
-        <span id="error-userName" class="error"></span>
+            <label for="userName"><strong>User name</strong></label>
-      </fieldset>
+            <input type="text" name="userName" id="userName" value=""/>
-    }
+            <span id="error-userName" class="error"></span>
-    <fieldset>
+          </fieldset>
-      <label for="password"><strong>Password</strong>
-        @if(account.nonEmpty){
-          (Input to change password)
         }
-      </label>
+        <fieldset>
-      <input type="password" name="password" id="password" value=""/>
+          <label for="password"><strong>Password</strong>
-      <span id="error-password" class="error"></span>
+            @if(account.nonEmpty){
-    </fieldset>
+              (Input to change password)
-    <fieldset>
+            }
-      <label for="mailAddress"><strong>Mail Address</strong></label>
+          </label>
-      <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+          <input type="password" name="password" id="password" value=""/>
-      <span id="error-mailAddress" class="error"></span>
+          <span id="error-password" class="error"></span>
-    </fieldset>
+        </fieldset>
-    <fieldset>
+        <fieldset>
-      <label for="url"><strong>URL (Optional)</strong></label>
+          <label for="mailAddress"><strong>Mail Address</strong></label>
-      <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+          <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-      <span id="error-url" class="error"></span>
+          <span id="error-mailAddress" class="error"></span>
-    </fieldset>
+        </fieldset>
-    <fieldset>
+        <fieldset>
+          <label for="url"><strong>URL (Optional)</strong></label>
+          <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+          <span id="error-url" class="error"></span>
+        </fieldset>
+      </div>
+      <div class="span6">
+        <fieldset>
+          <label for="avatar"><strong>Image (Optional)</strong></label>
+          @helper.html.uploadavatar(account)
+        </fieldset>
+      </div>
+    </div>
+    <fieldset class="margin">
       @if(account.isDefined){
         <input type="submit" class="btn btn-success" value="Save"/>
         <a href="@url(account.get.userName)" class="btn">Cancel</a>

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

@@ -1,49 +0,0 @@
-@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main(account.userName){
-  <div class="container-fluid">
-    <div class="row-fluid">
-      <div class="span4">
-        <div class="block">
-          <div class="block-header">@account.userName</div>
-        </div>
-        <div class="block">
-          <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
-          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
-        </div>
-      </div>
-      <div class="span8">
-        <ul class="nav nav-tabs">
-          <li class="active"><a href="#">Repositories</a></li>
-          <!--
-          <li><a href="#">Activity</a></li>
-          -->
-          @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
-          <li class="pull-right">
-            <div class="button-group">
-              <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
-            </div>
-          </li>
-          }
-        </ul>
-        @repositories.map { repository =>
-        <div class="block">
-          <div class="block-header">
-            <a href="@url(repository.owner)">@repository.owner</a>
-            /
-            <a href="@url(repository)">@repository.name</a>
-            @if(repository.repository.isPrivate){
-              <i class="icon-lock"></i>
-            }
-          </div>
-          @if(repository.repository.description.isDefined){
-            <div>@repository.repository.description</div>
-          }
-          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
-        </div>
-        }
-      </div>
-    </div>
-  </div>
-}

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

@@ -0,0 +1,42 @@
+@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(account.userName){
+  <div class="container-fluid">
+    <div class="row-fluid">
+      <div class="span4">
+        <div class="block">
+          <div class="account-image">@avatar(account.userName, 200)</div>
+          <div class="block-header">@account.userName</div>
+        </div>
+        <div class="block">
+          <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
+          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+        </div>
+      </div>
+      <div class="span8">
+        @tab(account, "repositories")
+        @if(repositories.isEmpty){
+          No repositories
+        } else {
+          @repositories.map { repository =>
+            <div class="block">
+              <div class="block-header">
+                <a href="@url(repository.owner)">@repository.owner</a>
+                /
+                <a href="@url(repository)">@repository.name</a>
+                @if(repository.repository.isPrivate){
+                  <i class="icon-lock"></i>
+                }
+              </div>
+              @if(repository.repository.description.isDefined){
+                <div>@repository.repository.description</div>
+              }
+              <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
+            </div>
+          }
+        }
+      </div>
+    </div>
+  </div>
+}

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

@@ -0,0 +1,14 @@
+@(account: model.Account, active: String)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+<ul class="nav nav-tabs">
+  <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
+  <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
+  @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
+    <li class="pull-right">
+      <div class="button-group">
+        <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
+      </div>
+    </li>
+  }
+</ul>

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

@@ -1,8 +1,9 @@
-@(settings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context)
+@(settings: service.SystemSettingsService.SystemSettings, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("System Settings"){
   @menu("system"){
+    @helper.html.information(info)
     <form action="@path/admin/system" method="POST" validate="true">
       <div class="box">
         <div class="box-header">System Settings</div>

src/main/twirl/admin/users/edit.scala.html

@@ -3,40 +3,50 @@
 @html.main(if(account.isEmpty) "New User" else "Update User"){
   @admin.html.menu("users"){
     <form method="POST" action="@if(account.isEmpty){@path/admin/users/_new} else {@path/admin/users/@account.get.userName/_edit}" validate="true">
-      <fieldset>
+      <div class="row-fluid">
-        <label for="userName"><strong>Username</strong></label>
+        <div class="span6">
-        <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+          <fieldset>
-        <span id="error-userName" class="error"></span>
+            <label for="userName"><strong>Username</strong></label>
-      </fieldset>
+            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-      <fieldset>
+            <span id="error-userName" class="error"></span>
-        <label for="password"><strong>Password</strong>
+          </fieldset>
-          @if(account.isDefined){
+          <fieldset>
-            (Input to change password)
+            <label for="password"><strong>Password</strong>
-          }
+              @if(account.isDefined){
-        </label>
+                (Input to change password)
-        <input type="password" name="password" id="password" value="" autocomplete="off"/>
+              }
-        <span id="error-password" class="error"></span>
+            </label>
-      </fieldset>
+            <input type="password" name="password" id="password" value="" autocomplete="off"/>
-      <fieldset>
+            <span id="error-password" class="error"></span>
-        <label for="mailAddress"><strong>Mail Address</strong></label>
+          </fieldset>
-        <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+          <fieldset>
-        <span id="error-mailAddress" class="error"></span>
+            <label for="mailAddress"><strong>Mail Address</strong></label>
-      </fieldset>
+            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-      <fieldset>
+            <span id="error-mailAddress" class="error"></span>
-        <label><strong>User Type</strong></label>
+          </fieldset>
-        <label for="userType_Normal">
+          <fieldset>
-          <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
+            <label><strong>User Type</strong></label>
-        </label>
+            <label for="userType_Normal">
-        <label for="userType_Admin">
+              <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
-          <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
+            </label>
-        </label>
+            <label for="userType_Admin">
-      </fieldset>
+              <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
-      <fieldset>
+            </label>
-        <label><strong>URL (Optional)</strong></label>
+          </fieldset>
-        <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+          <fieldset>
-        <span id="error-url" class="error"></span>
+            <label><strong>URL (Optional)</strong></label>
-      </fieldset>
+            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-      <fieldset>
+            <span id="error-url" class="error"></span>
+          </fieldset>
+        </div>
+        <div class="span6">
+          <fieldset>
+            <label for="avatar"><strong>Image (Optional)</strong></label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
         <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
         <a href="@path/admin/users" class="btn">Cancel</a>
       </fieldset>

src/main/twirl/admin/users/list.scala.html

@@ -14,6 +14,7 @@
               <a href="@path/admin/users/@account.userName/_edit">Edit</a>
             </div>
             <div class="strong">
+              @avatar(account.userName, 20)
               <a href="@url(account.userName)">@account.userName</a>
               @if(account.isAdmin){
                 (Administrator)

src/main/twirl/helper/activities.scala.html

@@ -0,0 +1,43 @@
+@(activities: List[model.Activity])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@if(activities.isEmpty){
+  No activity
+} else {
+  @activities.map { activity =>
+    <div class="block">
+      <div class="muted small">@datetime(activity.activityDate)</div>
+      <div class="strong">
+        @avatar(activity.activityUserName, 16)
+        @activityMessage(activity.message)
+      </div>
+      @activity.additionalInfo.map { additionalInfo =>
+        @(activity.activityType match {
+          case "create_wiki" => {
+            <div class="small activity-message">Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
+          }
+          case "edit_wiki" => {
+            <div class="small activity-message">Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
+          }
+          case "push" => {
+            <div class="small activity-message">
+              {additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
+                if(i == 3){
+                  <div>...</div>
+                } else {
+                  <div>
+                    <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
+                    <span>{commit.substring(41)}</span>
+                  </div>
+                }
+              }}
+            </div>
+          }
+          case _ => {
+            <div class=" activity-message">{additionalInfo}</div>
+          }
+        })
+      }
+    </div>
+  }
+}

src/main/twirl/helper/dropdown.scala.html

@@ -1,7 +1,11 @@
-@(body: Html)
+@(buttonValue: String = "")(body: Html)
 <div class="btn-group">
   <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-    <i class="icon-cog"></i>
+    @if(buttonValue == ""){
+      <i class="icon-cog"></i>
+    } else {
+      <strong>@buttonValue</strong>
+    }
     <span class="caret"></span>
   </button>
   <ul class="dropdown-menu">

src/main/twirl/helper/information.scala.html

@@ -0,0 +1,7 @@
+@(info: Option[Any])
+@if(info.isDefined){
+  <div class="alert alert-info">
+    <button type="button" class="close" data-dismiss="alert">×</button>
+    @info
+  </div>
+}

src/main/twirl/helper/preview.scala.html

@@ -1,5 +1,5 @@
-@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean,
+@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, enableRefsLink: Boolean,
-  enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
+  style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="tabbable">
@@ -30,10 +30,9 @@ $(function(){
   $('#preview').click(function(){
     $('#preview-area').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
     $.post('@url(repository)/_preview', {
-      content          : $('#content').val(),
+      content        : $('#content').val(),
-      enableWikiLink   : @enableWikiLink,
+      enableWikiLink : @enableWikiLink,
-      enableCommitLink : @enableCommitLink,
+      enableRefsLink : @enableRefsLink
-      enableIssueLink  : @enableIssueLink
     }, function(data){
       $('#preview-area').html(data);
       prettyPrint();

src/main/twirl/helper/uploadavatar.scala.html

@@ -0,0 +1,52 @@
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+<div id="avatar" class="muted">
+  @if(account.nonEmpty && account.get.image.nonEmpty){
+    <img src="@path/@account.get.userName/_avatar" style="with: 120px; height: 120px;"/>
+  } else {
+    <div id="clickable">
+      <a href="https://www.gravatar.com/" target="_blank">Gravatar</a> is used
+    </div>
+  }
+</div>
+@if(account.nonEmpty && account.get.image.nonEmpty){
+  <label>
+    <input type="checkbox" name="clearImage"/> Clear image
+  </label>
+}
+<input type="hidden" name="fileId" value=""/>
+<script>
+$(function(){
+  var dropzone = new Dropzone('div#clickable', {
+    url: '@path/upload/image',
+    previewsContainer: 'div#avatar',
+    paramName: 'file',
+    parallelUploads: 1,
+    thumbnailWidth: 120,
+    thumbnailHeight: 120
+  });
+
+  dropzone.on("success", function(file, id){
+    $('div#clickable').remove();
+    $('input[name=fileId]').val(id);
+  });
+});
+</script>
+<style type="text/css">
+div.dz-filename, div.dz-size, div.dz-progress, div.dz-success-mark, div.dz-error-mark, div.dz-error-message {
+  display: none;
+}
+
+div#clickable {
+  width: 100%;
+  text-align: center;
+  line-height: 120px;
+}
+
+div#avatar {
+  background-color: #f8f8f8;
+  border: 1px dashed silver;
+  width: 120px;
+  height: 120px;
+}
+</style>

src/main/twirl/index.scala.html

@@ -1,27 +1,14 @@
-@(repositories: List[service.RepositoryService.RepositoryInfo], systemSettings: service.SystemSettingsService.SystemSettings,
+@(activities: List[model.Activity],
+  repositories: List[service.RepositoryService.RepositoryInfo], 
+  systemSettings: service.SystemSettingsService.SystemSettings,
   userRepositories: List[String])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @main("GitBucket"){
 <div class="row-fluid">
   <div class="span8">
-  <h3>Recent updated repositories</h3>
+    <h3>News Feed</h3>
-  @repositories.map { repository =>
+    @helper.html.activities(activities)
-    <div class="block">
-      <div class="block-header">
-        <a href="@url(repository.owner)">@repository.owner</a>
-        /
-        <a href="@url(repository)">@repository.name</a>
-        @if(repository.repository.isPrivate){
-          <i class="icon-lock"></i>
-        }
-      </div>
-      @if(repository.repository.description.isDefined){
-        <div>@repository.repository.description</div>
-      }
-      <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
-    </div>
-  }
   </div>
   <div class="span4">
     @if(loginAccount.isEmpty){
@@ -29,15 +16,47 @@
     } else {
       <table class="table table-bordered">
         <tr>
-          <th class="metal">Your repositories (@userRepositories.size)</th>
+          <th class="metal">
+            <div class="pull-right">
+              <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
+            </div>
+            Your repositories (@userRepositories.size)
+          </th>
         </tr>
-        @userRepositories.map { repositoryName =>
+        @if(userRepositories.isEmpty){
           <tr>
-            <td><a href="@path/@loginAccount.get.userName/@repositoryName">@repositoryName</a></td>
+            <td>No repositories</td>
           </tr>
+        } else {
+          @userRepositories.map { repositoryName =>
+            <tr>
+              <td><a href="@path/@loginAccount.get.userName/@repositoryName"><strong>@repositoryName</strong></a></td>
+            </tr>
+          }
         }
       </table>
     }
+    
+    <table class="table table-bordered">
+      <tr>
+        <th class="metal">
+          Recent updated repositories
+        </th>
+      </tr>
+      @if(repositories.isEmpty){
+        <tr>
+          <td>No repositories</td>
+        </tr>
+      } else {
+        @repositories.map { repository =>
+          <tr>
+            <td>
+              <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+            </td>
+          </tr>
+        }
+      }
+    </table>
   </div>
 
 </div>

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

@@ -11,19 +11,20 @@
   <form action="@url(repository)/issues/new" method="POST" validate="true">
   <div class="row-fluid">
     <div class="span9">
-      <div class="box">
+      <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+      <div class="box issue-box">
         <div class="box-content">
           <span id="error-title" class="error"></span>
-          <input type="text" name="title" value="" placeholder="Title" style="width: 650px;"/>
+          <input type="text" name="title" value="" placeholder="Title" style="width: 600px;"/>
           <div>
             <span id="label-assigned">No one is assigned</span>
             @if(hasWritePermission){
               <input type="hidden" name="assignedUserName" value=""/>
-              @helper.html.dropdown {
+              @helper.html.dropdown() {
                 <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
                 <li class="divider"></li>
                 @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i> @collaborator</a></li>
+                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i>@avatar(collaborator, 20) @collaborator</a></li>
                 }
               }
             }
@@ -31,7 +32,7 @@
               <span id="label-milestone">No milestone</span>
               @if(hasWritePermission){
                 <input type="hidden" name="milestoneId" value=""/>
-                @helper.html.dropdown {
+                @helper.html.dropdown() {
                   <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
                   <li class="divider"></li>
                   @milestones.map { milestone =>
@@ -42,10 +43,12 @@
             </div>
           </div>
           <hr>
-          @helper.html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
+          @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px;")
         </div>
       </div>
-      <input type="submit" class="btn btn-success" value="Submit new issue"/>
+      <div class="pull-right">
+        <input type="submit" class="btn btn-success" value="Submit new issue"/>
+      </div>
     </div>
     <div class="span3">
       @if(hasWritePermission){

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

@@ -1,7 +1,7 @@
 @(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context)
 @import context._
 <span id="error-edit-content-@commentId" class="error"></span>
-<textarea style="width: 730px; height: 100px;" id="edit-content-@commentId">@content</textarea>
+<textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea>
 <input type="button" class="btn btn-small" value="Update Comment"/>
 <span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
 <script>

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

@@ -1,8 +1,8 @@
 @(title: String, content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context)
 @import context._
 <span id="error-edit-title" class="error"></span>
-<input type="text" style="width: 730px;" id="edit-title" value="@title"/>
+<input type="text" style="width: 680px;" id="edit-title" value="@title"/>
-<textarea style="width: 730px; height: 100px;" id="edit-content">@content.getOrElse("")</textarea>
+<textarea style="width: 680px; height: 100px;" id="edit-content">@content.getOrElse("")</textarea>
 <input type="button" class="btn btn-small" value="Update Issue"/>
 <span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
 <script>

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

@@ -8,7 +8,7 @@
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
+@html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}"){
   @html.header("issues", repository)
   @tab("issues", repository)
   <ul class="nav nav-tabs">
@@ -17,7 +17,8 @@
   </ul>
   <div class="row-fluid">
     <div class="span10">
-      <div class="box">
+      <div class="issue-avatar-image">@avatar(issue.openedUserName, 48)</div>
+      <div class="box issue-box">
         <div class="box-content" style="padding: 0px;">
           <div class="issue-header">
             @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
@@ -31,15 +32,15 @@
           <div class="issue-info">
             <span id="label-assigned">
               @issue.assignedUserName.map { userName =>
-                <a href="@url(userName)" class="username strong">@userName</a> is assigned
+                @avatar(userName, 20) <a href="@url(userName)" class="username strong">@userName</a> is assigned
               }.getOrElse("No one is assigned")
             </span>
             @if(hasWritePermission){
-              @helper.html.dropdown {
+              @helper.html.dropdown() {
                 <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
                 <li class="divider"></li>
                 @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i> @collaborator</a></li>
+                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
                 }
               }
             }
@@ -52,7 +53,7 @@
                 }.getOrElse("No milestone")
               </span>
               @if(hasWritePermission){
-                @helper.html.dropdown {
+                @helper.html.dropdown() {
                   <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
                   <li class="divider"></li>
                   @milestones.map { milestone =>
@@ -63,50 +64,57 @@
             </div>
           </div>
           <div class="issue-content" id="issueContent">
-            @markdown(issue.content getOrElse "No description given.", repository, false, true, true)
+            @markdown(issue.content getOrElse "No description given.", repository, false, true)
           </div>
         </div>
       </div>
       @comments.map { comment =>
+        @if(comment.action != "close" && comment.action != "reopen"){
+        <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
         <div class="box issue-comment-box" id="comment-@comment.commentId">
           <div class="box-header-small">
             <i class="icon-comment"></i>
             <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> commented
             <span class="pull-right">
               @datetime(comment.registeredDate)
-              @if(hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
+              @if(comment.action != "commit" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
                 <a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>
               }
             </span>
           </div>
           <div class="box-content"class="issue-content" id="commentContent-@comment.commentId">
-            @markdown(comment.content, repository, false, true, true)
+            @markdown(comment.content, repository, false, true)
           </div>
         </div>
-        @comment.action.map { action =>
+        }
+        @if(comment.action == "close" || comment.action == "close_comment"){
         <div class="small issue-comment-action">
-          @if(action == "close"){
+          <span class="label label-important">Closed</span>
-            <span class="label label-important">Closed</span>
+          <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
-            <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
+        </div>
-          } else {
+        }
-            <span class="label label-success">Reopened</span>
+        @if(comment.action == "reopen" || comment.action == "reopen_comment"){
-            <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
+        <div class="small issue-comment-action">
-          }
+          <span class="label label-success">Reopened</span>
+          <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
         </div>
         }
       }
       @if(loginAccount.isDefined){
-        <form action="@url(repository)/issue_comments/new" method="POST" validate="true">
+        <form method="POST" validate="true">
-          <div class="box">
+          <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+          <div class="box issue-comment-box">
             <div class="box-content">
-              @helper.html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
+              @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px;")
             </div>
           </div>
-          <input type="hidden" name="issueId" value="@issue.issueId"/>
+          <div class="pull-right">
-          <input type="submit" class="btn btn-success" value="Comment"/>
+            <input type="hidden" name="issueId" value="@issue.issueId"/>
-          @if(hasWritePermission || issue.openedUserName == loginAccount.get.userName){
+            <input type="submit" class="btn btn-success" formaction="@url(repository)/issue_comments/new" value="Comment"/>
-            <input type="submit" class="btn" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
+            @if(hasWritePermission || issue.openedUserName == loginAccount.get.userName){
-          }
+              <input type="submit" class="btn" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
+            }
+          </div>
         </form>
       }
     </div>
@@ -117,14 +125,16 @@
         <span class="label label-success issue-status">Open</span>
       }
       <div class="small" style="text-align: center;">
-        <strong>@comments.size</strong> @plural(comments.size, "comment")
+        @defining(comments.filter( _.action.contains("comment") ).size){ count =>
+          <strong>@count</strong> @plural(count, "comment")
+        }
       </div>
       <hr/>
       <div style="margin-bottom: 8px;">
       <strong>Labels</strong>
       @if(hasWritePermission){
         <div class="pull-right">
-          @helper.html.dropdown {
+          @helper.html.dropdown() {
             @labels.map { label =>
               <li>
                 <a href="#" class="toggle-label" data-label-id="@label.labelId">
@@ -134,7 +144,6 @@
                 </a>
               </li>
             }
-            </ul>
           }
         </div>
       }

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

@@ -1,7 +1,8 @@
 @(issues: List[(model.Issue, List[model.Label], Int)],
   page: Int,
-  labels: List[model.Label],
+  collaborators: List[String],
   milestones: List[model.Milestone],
+  labels: List[model.Label],
   openCount: Int,
   closedCount: Int,
   allCount: Int,
@@ -51,7 +52,7 @@
           <span class="muted small">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title)
         }
       }
-      @helper.html.dropdown {
+      @helper.html.dropdown() {
         @if(condition.milestoneId.isDefined){
           <li>
             <a href="@condition.copy(milestoneId = None).toURL">
@@ -166,23 +167,6 @@
         </ul>
       </div>
       <table class="table table-bordered table-hover table-issues">
-      @issues.map { case (issue, labels, commentCount) =>
-        <tr>
-          <td>
-            <a href="@url(repository)/issues/@issue.issueId" class="issue-title">@issue.title</a>
-            @labels.map { label =>
-              <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
-            }
-            <span class="pull-right muted">#@issue.issueId</span>
-            <div class="small muted">
-              Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
-              @if(commentCount > 0){
-                <i class="icon-comment"></i><a href="@url(repository)/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
-              }
-            </div>
-          </td>
-        </tr>
-      }
       @if(issues.isEmpty){
         <tr>
           <td style="padding: 20px; background-color: #eee; text-align: center;">
@@ -194,6 +178,68 @@
             }
           </td>
         </tr>
+      } else {
+        @if(hasWritePermission){
+        <tr>
+          <td style="background-color: #eee;">
+            <div class="btn-group">
+              <button class="btn btn-mini" id="state"><strong>@{if(condition.state == "open") "Close" else "Reopen"}</strong></button>
+            </div>
+            @helper.html.dropdown("Label") {
+              @labels.map { label =>
+                <li>
+                  <a href="javascript:void(0);" class="toggle-label" data-id="@label.labelId">
+                    <i class="icon-white"></i>
+                    <span class="label" style="background-color: #@label.color;">&nbsp;</span>
+                    @label.labelName
+                  </a>
+                </li>
+              }
+            }
+            @helper.html.dropdown("Assignee") {
+              <li><a href="javascript:void(0);" class="toggle-assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
+              <li class="divider"></li>
+              @collaborators.map { collaborator =>
+                <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
+              }
+            }
+            @helper.html.dropdown("Milestone") {
+              <li><a href="javascript:void(0);" class="toggle-milestone" data-id=""><i class="icon-remove-circle"></i> Clear this milestone</a></li>
+              <li class="divider"></li>
+              @milestones.map { milestone =>
+                <li><a href="javascript:void(0);" class="toggle-milestone" data-id="@milestone.milestoneId"><i class="icon-white"></i> @milestone.title</a></li>
+              }
+            }
+          </td>
+        </tr>
+        }
+      }
+      @issues.map { case (issue, labels, commentCount) =>
+        <tr>
+          <td>
+            @if(hasWritePermission){
+            <label class="checkbox" style="cursor: default;">
+              <input type="checkbox" value="@issue.issueId"/>
+            }
+              <a href="@url(repository)/issues/@issue.issueId" class="issue-title">@issue.title</a>
+              @labels.map { label =>
+                <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
+              }
+              <span class="pull-right muted">
+                @issue.assignedUserName.map { userName =>
+                  @avatar(userName, 20, tooltip = true)
+                }
+                #@issue.issueId
+              </span>
+              <div class="small muted">
+                Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
+                @if(commentCount > 0){
+                  <i class="icon-comment"></i><a href="@url(repository)/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
+                }
+              </div>
+            </label>
+          </td>
+        </tr>
       }
       </table>
       <div class="pull-right">
@@ -201,6 +247,12 @@
       </div>
     </div>
   </div>
+  @if(hasWritePermission){
+    <form id="batcheditForm" method="POST">
+      <input type="hidden" name="value"/>
+      <input type="hidden" name="checked"/>
+    </form>
+  }
 }
 @if(hasWritePermission){
 <script>
@@ -215,6 +267,33 @@ $(function(){
       });
     }
   });
+
+  $('.table-issues input[type=checkbox]').change(function(){
+    $('.table-issues button').prop('disabled',
+            !$('.table-issues input[type=checkbox]').filter(':checked').length);
+  }).filter(':first').change();
+
+  var submitBatchEdit = function(action, value) {
+    var checked = $('.table-issues input[type=checkbox]').filter(':checked').map(function(){ return this.value; }).get().join();
+    var form = $('#batcheditForm');
+    form.find('input[name=value]').val(value);
+    form.find('input[name=checked]').val(checked);
+    form.attr('action', action);
+    form.submit();
+  };
+
+  $('#state').click(function(){
+    submitBatchEdit('@url(repository)/issues/batchedit/state', $(this).text().toLowerCase());
+  });
+  $('a.toggle-label').click(function(){
+    submitBatchEdit('@url(repository)/issues/batchedit/label', $(this).data('id'));
+  });
+  $('a.toggle-assign').click(function(){
+    submitBatchEdit('@url(repository)/issues/batchedit/assign', $(this).data('name'));
+  });
+  $('a.toggle-milestone').click(function(){
+    submitBatchEdit('@url(repository)/issues/batchedit/milestone', $(this).data('id'));
+  });
 });
 </script>
 }

src/main/twirl/issues/milestones/list.scala.html

@@ -81,7 +81,7 @@
               </div>
               @if(milestone.description.isDefined){
                 <div class="milestone-description">
-                  @markdown(milestone.description.get, repository, false, false, false)
+                  @markdown(milestone.description.get, repository, false, false)
                 </div>
               }
             </td>

src/main/twirl/main.scala.html

@@ -19,15 +19,17 @@
     <link href="@assets/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
     <link href="@assets/common/css/gitbucket.css" rel="stylesheet">
     <script src="@assets/common/js/jquery-1.9.1.js"></script>
+    <script src="@assets/common/js/dropzone.js"></script>
     <script src="@assets/common/js/validation.js"></script>
     <script src="@assets/common/js/gitbucket.js"></script>
     <script src="@assets/bootstrap/js/bootstrap.js"></script>
     <script src="@assets/datepicker/js/bootstrap-datepicker.js"></script>
     <script src="@assets/colorpicker/js/bootstrap-colorpicker.js"></script>
     <script src="@assets/google-code-prettify/prettify.js"></script>
+    <script src="@assets/zclip/ZeroClipboard.min.js"></script>
   </head>
   <body>
-    <div class="navbar navbar-inverse">
+    <div class="navbar">
       <div class="navbar-inner">
         <div class="container">
           <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -36,25 +38,27 @@
             <span class="icon-bar"></span>
           </button>
           <a class="brand" href="@path/">GitBucket</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse collapse pull-right">
-            <ul class="nav pull-right">
+            @if(loginAccount.isDefined){
-              @if(loginAccount.isDefined){
+              <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
-                <li><a href="@path/new">New repo</a></li>
+              <a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>
-                <li><a href="@url(loginAccount.get.userName)">Account</a></li>
+              <a href="@url(loginAccount.get.userName)/_edit" class="menu" data-toggle="tooltip" data-placement="bottom" title="Account settings"><i class="icon-user"></i></a>
-                @if(loginAccount.get.isAdmin){
+              @if(loginAccount.get.isAdmin){
-                  <li><a href="@path/admin/users">Administration</a></li>
+                <a href="@path/admin/users" class="menu" data-toggle="tooltip" data-placement="bottom" title="Administration"><i class="icon-wrench"></i></a>
-                }
-                <li><a href="@path/signout">Sign out</a></li>
-              } else {
-                <li><a href="@path/signin?@currentUrl">Sign in</a></li>
               }
-            </ul>
+              <a href="@path/signout" class="menu-last" data-toggle="tooltip" data-placement="bottom" title="Sign out"><i class="icon-share-alt"></i></a>
+            } else {
+              <a href="@path/signin?@currentUrl" class="btn btn-last">Sign in</a>
+            }
           </div><!--/.nav-collapse -->
         </div>
       </div>
+      @defining(servlet.AutoUpdate.getCurrentVersion){ version =>
+        <div class="gitbucket-version">version @version.majorVersion.@version.minorVersion</div>
+      }
     </div>
     <div class="container body">
       @body
     </div>
   </body>
-</html>
+</html>

src/main/twirl/newrepo.scala.html

@@ -1,6 +1,7 @@
 @()(implicit context: app.Context)
 @import context._
 @main("Create a New Repository"){
+<div style="width: 600px; margin: 10px auto;">
 <form id="form" method="post" action="@path/new" validate="true">
   <fieldset>
     <label for="name"><strong>Repository name</strong></label>
@@ -9,10 +10,38 @@
   </fieldset>
   <fieldset>
     <label for="description"><strong>Description</strong> (optional)</label>
-    <input type="text" name="description" id="description" style="width: 600px;"/>
+    <input type="text" name="description" id="description" style="width: 95%;"/>
+  </fieldset>
+  <fieldset class="margin">
+    <label>
+      <input type="radio" name="isPrivate" value="false" checked>
+      <strong>Public</strong><br>
+      <div>
+        <span class="note">All users and guests can read this repository.</span>
+      </div>
+    </label>
   </fieldset>
   <fieldset>
+    <label>
+      <input type="radio" name="isPrivate" value="true">
+      <strong>Private</strong><br>
+      <div>
+        <span class="note">Only collaborators can read this repository.</span>
+      </div>
+    </label>
+  </fieldset>
+  <fieldset class="margin">
+    <label for="createReadme">
+      <input type="checkbox" name="createReadme" id="createReadme"/>
+      <strong>Initialize this repository with a README</strong>
+      <div>
+        <span class="note">This will allow you to <code>git clone</code> the repository immediately.</span>
+      </div>
+    </label>
+  </fieldset>
+  <fieldset class="margin">
     <input type="submit" class="btn btn-success" value="Create repository"/>
   </fieldset>
 </form>
-}
+</div>
+}

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

@@ -23,6 +23,7 @@
     <tr>
       <th style="font-weight: normal;">
         <div class="pull-left">
+          @avatar(latestCommit, 20)
           <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
           <span class="muted">@datetime(latestCommit.time)</span>
           <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>

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

@@ -43,7 +43,9 @@
     </tr>
     <tr>
       <td>
-        <a href="@url(commit.committer)" class="username strong">@commit.committer</a> <span class="muted">@datetime(commit.time)</span>
+        @avatar(commit, 20)
+        <a href="@url(commit.committer)" class="username strong">@commit.committer</a>
+        <span class="muted">@datetime(commit.time)</span>
         <div class="pull-right monospace small" style="text-align: right;">
           <div>
             @if(commit.parents.size == 0){
@@ -72,11 +74,14 @@
     <div class="pull-right" style="margin-bottom: 10px;">
       <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
     </div>
+    Showing @diffs.size changed @plural(diffs.size, "file")
+    @*
     @if(diffs.size == 1){
-      Showing 1 changed files
+      Showing 1 changed file
     } else {
       Showing @diffs.size changed files
     }
+    *@
   </div>
   <ul id="commit-file-list" style="display: none;">
   @diffs.zipWithIndex.map { case (diff, i) =>

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

@@ -33,24 +33,27 @@
       @day.map { commit =>
       <tr>
         <td>
-          <div class="pull-left">
-            <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-            @if(commit.description.isDefined){
-              <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
-            }
-            <br>
-            @if(commit.description.isDefined){
-              <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
-            }
-            <div class="small">
-              <a href="@url(commit.committer)" class="username">@commit.committer</a>
-              <span class="muted">@datetime(commit.time)</span>
-            </div>
-          </div>
           <div class="pull-right align-right">
             <a href="@url(repository)/commit/@commit.id" class="btn btn-small monospace">@commit.id.substring(0, 10)</a><br>
             <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
           </div>
+          <div>
+            <div class="commit-avatar-image">@avatar(commit, 40)</div>
+            <div class="commit-message-box">
+              <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
+              @if(commit.description.isDefined){
+                <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+              }
+              <br>
+              @if(commit.description.isDefined){
+                <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+              }
+              <div class="small">
+                <a href="@url(commit.committer)" class="username">@commit.committer</a>
+                <span class="muted">@datetime(commit.time)</span>
+              </div>
+            </div>
+          </div>
         </td>
       </tr>
       }

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

@@ -10,6 +10,11 @@
   @html.header("code", repository)
   @tab(branch, repository, "files")
   <div class="head">
+    <div class="pull-right">
+      @defining(repository.commitCount){ commitCount =>
+        <a href="@url(repository)/commits/@branch">@if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
+      }
+    </div>
     <a href="@url(repository)/tree/@branch">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>
       <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
@@ -22,8 +27,6 @@
           <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
           @if(latestCommit.description.isDefined){
             <a href="javascript:void(0)" onclick="$('#description-@latestCommit.id').toggle();" class="omit">...</a>
-          }
-          @if(latestCommit.description.isDefined){
             <pre id="description-@latestCommit.id" class="commit-description" style="display: none;">@link(latestCommit.description.get, repository)</pre>
           }
         </th>
@@ -31,6 +34,7 @@
       <tr>
         <td colspan="4" class="latest-commit">
           <div>
+            @avatar(latestCommit, 20)
             <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
             <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace">
@@ -73,7 +77,7 @@
   @readme.map { content =>
   <div class="box">
     <div class="box-header">README.md</div>
-    <div class="box-content">@markdown(content, repository, false, false, false)</div>
+    <div class="box-content">@markdown(content, repository, false, false)</div>
   </div>
   }
 }

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

@@ -0,0 +1,21 @@
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(repository.owner + "/" + repository.name) {
+@html.header("code", repository)
+<h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
+<pre>
+touch README.md
+git init
+git add README.md
+git commit -m "first commit"
+git remote add origin @repository.url
+git push -u origin master
+</pre>
+
+<h3 style="margin-top: 30px;">Push an existing repository from the command line</h3>
+<pre>
+git remote add origin @repository.url
+git push -u origin master
+</pre>
+}

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

@@ -1,15 +1,21 @@
-@(id: String, repository: service.RepositoryService.RepositoryInfo, active: String)(implicit context: app.Context)
+@(id: String, repository: service.RepositoryService.RepositoryInfo, active: String,
+  hideBranchPulldown: Boolean = false)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <ul class="nav nav-tabs">
+  @if(!hideBranchPulldown){
   <li>
     <div class="btn-group" style="margin-right: 20px;">
       <button class="btn dropdown-toggle" data-toggle="dropdown">
         @if(id.length == 40){
           tree: <strong>@id.substring(0, 10)</strong>
-        } else {
+        }
+        @if(repository.branchList.contains(id)){
           branch: <strong>@id</strong>
         }
+        @if(repository.tags.exists(_.name == id)){
+          tag: <strong>@id</strong>
+        }
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu">
@@ -19,13 +25,14 @@
       </ul>
     </div>
   </li>
+  }
   <li@if(active=="files"){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
   <li@if(active=="commits"){ class="active"}><a href="@url(repository)/commits/@id">Commits</a></li>
   <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">
-    <div class="input-prepend">
+    <div class="input-append">
-      <span class="add-on">HTTP</span>
       <input type="text" value="@repository.url" id="repository-url" readonly>
+      <span id="repository-url-copy" class="add-on btn" data-clipboard-text="@repository.url" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
     </div>
   </li>
 </ul>

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

@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main(repository.owner + "/" + repository.name) {
   @html.header("code", repository)
-  @tab("master", repository, "tags") @* TODO DON'T display branch pulldown *@
+  @tab(repository.repository.defaultBranch, repository, "tags", true)
   <h1>Tags</h1>
   <table class="table table-bordered">
     <tr>

src/main/twirl/settings/options.scala.html

@@ -1,9 +1,10 @@
-@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("Settings"){
   @html.header("settings", repository)
   @menu("options", repository){
+    @helper.html.information(info)
     <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
       <div class="box">
         <div class="box-header">Settings</div>
@@ -22,17 +23,24 @@
             </select>
           </fieldset>
           <hr>
-          <fieldset>
+  <fieldset class="margin">
-            <label><strong>Repository Type</strong></label>
+    <label>
-            <label>
+      <input type="radio" name="isPrivate" value="false" checked>
-              <input type="radio" name="isPrivate" value="false"@if(!repository.repository.isPrivate){ checked}>
+      <strong>Public</strong><br>
-              <strong>Public</strong> - All users and guests can read this repository.
+      <div>
-            </label>
+        <span class="note">All users and guests can read this repository.</span>
-            <label>
+      </div>
-              <input type="radio" name="isPrivate" value="true"@if(repository.repository.isPrivate){ checked}>
+    </label>
-              <strong>Private</strong> - Only collaborators can read this repository.
+  </fieldset>
-            </label>
+  <fieldset>
-          </fieldset>
+    <label>
+      <input type="radio" name="isPrivate" value="true">
+      <strong>Private</strong><br>
+      <div>
+        <span class="note">Only collaborators can read this repository.</span>
+      </div>
+    </label>
+  </fieldset>
         </div>
       </div>
       @*

src/main/twirl/signinform.scala.html

@@ -2,22 +2,26 @@
 @import context._
 <table class="table table-bordered">
   <tr>
-    <th class="metal">Sign in</th>
+    <th class="metal">
+      @if(systemSettings.allowAccountRegistration){
+        <div class="pull-right">
+          <a href="@path/register" class="btn btn-mini">Create new account</a>
+        </div>
+      }
+      Sign in
+    </th>
   </tr>
   <tr>
     <td>
       <form action="@path/signin" method="POST" validate="true">
         <label for="userName">Username</label>
-        <input type="text" name="userName" id="userName" style="width: 95%"/>
         <span id="error-userName" class="error"></span>
+        <input type="text" name="userName" id="userName" style="width: 95%"/>
         <label for="password">Password</label>
-        <input type="password" name="password" id="password" style="width: 95%"/>
         <span id="error-password" class="error"></span>
+        <input type="password" name="password" id="password" style="width: 95%"/>
         <div>
           <input type="submit" class="btn btn-success" value="Sign in"/>
-          @if(systemSettings.allowAccountRegistration){
-            <a href="@path/register" class="btn">Create new account</a>
-          }
         </div>
       </form>
     </td>

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

@@ -14,8 +14,8 @@
     <li class="pull-right">
       <div class="btn-group">
       @if(pageName.isDefined){
-        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Back to Page History</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
       } else {
         <a class="btn" href="@url(repository)/wiki/_history">Back to Wiki History</a>
       }

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

@@ -13,9 +13,9 @@
     <li class="pull-right">
       <div class="btn-group">
       @if(pageName != ""){
-        <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_delete" id="delete">Delete Page</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
       }
       </div>
     </li>
@@ -23,7 +23,7 @@
   <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
+    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")
     <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
     <input type="hidden" name="currentPageName" value="@pageName"/>
     <input type="submit" value="Save" class="btn btn-success">

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

@@ -23,9 +23,9 @@
             <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
           }
         } else {
-          <a class="btn" href="@url(repository)/wiki/@pageName">View Page</a>
+          <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
           @if(loginAccount.isDefined){
-            <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
+            <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
           }
         }
       </div>
@@ -35,7 +35,7 @@
     @commits.map { commit =>
       <tr>
         <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
-        <td><a href="@url(commit.committer)">@commit.committer</a></td>
+        <td>@avatar(commit.committer, 20)<a href="@url(commit.committer)">@commit.committer</a></td>
         <td width="80%">
           <span class="muted">@datetime(commit.time):</span>
           @commit.shortMessage
@@ -58,7 +58,7 @@
           location.href = '@url(repository)/wiki/_compare/' +
             $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
         } else {
-          location.href = '@url(repository)/wiki/@pageName.get/_compare/' +
+          location.href = '@url(repository)/wiki/@urlEncode(pageName.get)/_compare/' +
             $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
         }
       }

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

@@ -15,19 +15,16 @@
       <div class="btn-group">
         @if(hasWritePermission){
           <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-          <a class="btn" href="@url(repository)/wiki/@pageName/_edit">Edit Page</a>
+          <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
         }
-        <a class="btn" href="@url(repository)/wiki/@pageName/_history">Page History</a>
+        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
       </div>
     </li>
   </ul>
   <div class="markdown-body">
-    @markdown(page.content, repository, true, false, false)
+    @markdown(page.content, repository, true, false)
   </div>
   <div class="small">
     <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
   </div>
 }
-<script>
-  $(function(){ prettyPrint(); });
-</script>

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

@@ -18,7 +18,7 @@
   </ul>
   <ul>
     @pages.map { page =>
-      <li><a href="@url(repository)/wiki/@page">@page</a></li>
+      <li><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
     }
   </ul>
 

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

@@ -6,9 +6,9 @@
   <li@if(active == "pages"){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
   <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
   <li class="pull-right">
-    <div class="input-prepend">
+    <div class="input-append">
-      <span class="add-on">HTTP</span>
       <input type="text" value="@repository.url.replaceFirst("\\.git$", ".wiki.git")" readonly id="repository-url">
+      <span id="repository-url-copy" class="add-on btn" data-clipboard-text="@repository.url.replaceFirst("\\.git$", ".wiki.git")" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
     </div>
   </li>
 </ul>

src/main/webapp/WEB-INF/web.xml

@@ -4,13 +4,20 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
+  <!-- ===================================================================== -->
+  <!-- Session configuration -->
+  <!-- ===================================================================== -->
+  <listener>
+    <listener-class>servlet.SessionCleanupListener</listener-class>
+  </listener>
+
   <!-- ===================================================================== -->
   <!-- Scalatra configuration -->
   <!-- ===================================================================== -->
   <listener>
     <listener-class>org.scalatra.servlet.ScalatraListener</listener-class>
   </listener>
-  
+
   <servlet>
     <servlet-name>GitRepositoryServlet</servlet-name>
     <servlet-class>servlet.GitRepositoryServlet</servlet-class>

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

@@ -5,6 +5,38 @@ body {
   color: #333;
 }
 
+div.navbar-inner {
+  border-radius: 0px;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  border-top: none;
+  border-left: none;
+  border-right: none;
+  border-bottom: 1px solid #d4d4d4;
+  padding-right: 0px;
+}
+
+div.nav-collapse a.menu {
+  margin-right: 12px;
+  line-height: 40px;
+}
+
+div.nav-collapse a.btn-last {
+  margin-right: 30px;
+}
+
+div.nav-collapse a.menu-last {
+  margin-right: 30px;
+  line-height: 40px;
+}
+
+div.gitbucket-version {
+  font-size: small;
+  color: silver;
+  float: right;
+  margin-right: 10px;
+}
+
 table.global-nav {
   width: 920px;
   margin-bottom: 10px;
@@ -97,7 +129,7 @@ div.block-header {
 div.block {
   padding-top: 10px;
   padding-bottom: 10px;
-  border-bottom: 1px solid silver;
+  border-bottom: 1px solid #ddd;
 }
 
 h3 {
@@ -123,7 +155,7 @@ div.box-header {
   border-top-right-radius: 1px;
   border: 1px solid #d8d8d8;
   border-bottom: none;
-  padding: 10px 10px 11px 10px;
+  padding: 8px 10px 8px 10px;
   text-shadow: 0 1px 0 #fff
 }
 
@@ -186,6 +218,34 @@ hr {
   margin-bottom: 4px;
 }
 
+span.note {
+  margin-left: 20px;
+}
+
+img.avatar {
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+}
+
+div.activity-message {
+  margin-left: 20px;
+}
+
+fieldset.margin {
+  border-top: 1px solid #eee;
+  margin-top: 10px;
+  padding-top: 10px;
+}
+
+div.account-image {
+  text-align: center;
+  margin-bottom: 8px;
+}
+
+/****************************************************************************/
+/* Sign-in form */
+/****************************************************************************/
 div.signin-form {
   width: 350px;
   margin: 30px auto;
@@ -270,6 +330,15 @@ th, td, .table th, .table td {
   padding-bottom: 4px;
 }
 
+div.commit-avatar-image {
+  float: left;
+  margin-right: 4px;
+}
+
+div.commit-message-box {
+  margin-left: 42px;
+}
+
 pre.commit-description {
   font-weight: normal;
   border: none;
@@ -437,9 +506,18 @@ h4#issueTitle {
   padding: 0px;
 }
 
+div.issue-avatar-image {
+  float: left;
+}
+
+div.issue-box {
+  margin-bottom: 15px;
+  margin-left: 50px;
+}
+
 div.issue-comment-box {
   margin-bottom: 15px;
-  margin-top: 25px;
+  margin-left: 50px;
 }
 
 div.issue-comment-action {
@@ -478,6 +556,7 @@ ul.collaborator li {
   border: 1px solid #ccc;
   border-radius: 3px;
   padding: 6px;
+  margin-bottom: 2px;
 }
     
 ul.collaborator li:hover {

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

@@ -1,11 +1,44 @@
 $(function(){
-  $.ajaxSetup({
+  // disable Ajax cache
-    cache: false
+  $.ajaxSetup({ cache: false });
-  });
 
   $('#repository-url').click(function(){
     this.select(0, this.value.length); 
   });
 
+  $('img[data-toggle=tooltip]').tooltip();
+  $('a[data-toggle=tooltip]').tooltip();
+
+  // copy to clipboard
+  (function() {
+    // Find ZeroClipboard.swf file URI from ZeroClipboard JavaScript file path.
+    // NOTE(tanacasino) I think this way is wrong... but i don't know correct way.
+    var moviePath = (function() {
+      var zclipjs = "ZeroClipboard.min.js";
+      var scripts = document.getElementsByTagName("script");
+      var i = scripts.length;
+      while(i--) {
+        var match = scripts[i].src.match(zclipjs + "$");
+        if(match) {
+          return match.input.substr(0, match.input.length - 6) + 'swf';
+        }
+      }
+    })();
+    var clip = new ZeroClipboard($("#repository-url-copy"), {
+      moviePath: moviePath
+    });
+    var title = $('#repository-url-copy').attr('title');
+    $('#repository-url-copy').removeAttr('title')
+    clip.on('complete', function(client, args) {
+      $(clip.htmlBridge).attr('title', 'copied!').tooltip('fixTitle').tooltip('show');
+      $(clip.htmlBridge).attr('title', title).tooltip('fixTitle');
+    });
+    $(clip.htmlBridge).tooltip({
+      title: title,
+      placement: $('#repository-url-copy').attr('data-placement')
+    });
+  })();
+
+  // syntax highlighting by google-code-prettify
   prettyPrint();
 });

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

@@ -2,6 +2,12 @@ $(function(){
   $.each($('form[validate=true]'), function(i, form){
     $(form).submit(validate);
   });
+  $.each($('input[formaction]'), function(i, input){
+    $(input).click(function(){
+      var form = $(input).parents('form')
+      $(form).attr('action', $(input).attr('formaction'))
+    });
+  });
 });
 
 function validate(e){
@@ -19,6 +25,7 @@ function validate(e){
       form.data('validated', true);
       form.submit();
     } else {
+      form.data('validated', false);
       displayErrors(data);
     }
   }, 'json');