(refs #458 )Skip unexpected commit message

This patch is temporary measures. MUST create AutoUpdate before release 2.3.
(refs#458)Correct short and full message
2026-05-08 04:47:08 +02:00 · 2014-08-05 00:43:20 +09:00 · 2014-08-05 00:07:21 +09:00 · 2014-08-04 00:08:05 +09:00 · 2014-08-04 00:00:41 +09:00 · 2014-08-03 23:59:56 +09:00
408 changed files with 273731 additions and 6067 deletions
--- a/README.md
+++ b/README.md
@@ -1,12 +1,15 @@
-GitBucket
+GitBucket [![Gitter chat](https://badges.gitter.im/takezoe/gitbucket.png)](https://gitter.im/takezoe/gitbucket) [![Build Status](https://buildhive.cloudbees.com/job/takezoe/job/gitbucket/badge/icon)](https://buildhive.cloudbees.com/job/takezoe/job/gitbucket/)
 =========

 GitBucket is the easily installable Github clone written with Scala.

+
+Features
+--------
 The current version of GitBucket provides a basic features below:

- Public / Private Git repository (http access only)
- Repository viewer (some advanced features such as online file editing are not implemented)
+- Public / Private Git repository (http and ssh access)
+- Repository viewer and online file editing
 - Repository search (Code and Issues)
 - Wiki
 - Issues
@@ -20,7 +23,6 @@ The current version of GitBucket provides a basic features below:

 Following features are not implemented, but we will make them in the future release!

- File editing in repository viewer
 - Comment for the changeset
 - Network graph
 - Statistics
@@ -51,6 +53,24 @@ To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored i
 For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)

 ### Mac OS X
+#### Installing Via Homebrew
+
+    $ brew install gitbucket
+    ==> Downloading https://github.com/takezoe/gitbucket/releases/download/1.10/gitbucket.war
+    ######################################################################## 100.0%
+    ==> Caveats
+    Note: When using launchctl the port will be 8080.
+
+    To have launchd start gitbucket at login:
+        ln -sfv /usr/local/opt/gitbucket/*.plist ~/Library/LaunchAgents
+    Then to load gitbucket now:
+        launchctl load ~/Library/LaunchAgents/homebrew.mxcl.gitbucket.plist
+    Or, if you don't want/need launchctl, you can just run:
+        java -jar /usr/local/opt/gitbucket/libexec/gitbucket.war
+    ==> Summary
+    /usr/local/Cellar/gitbucket/1.10: 3 files, 42M, built in 11 seconds
+
+#### Manual Installation
 On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`

 Run the following commands in `Terminal` to
@@ -60,6 +80,30 @@ Run the following commands in `Terminal` to

 Release Notes
 --------
+### 2.2 - 4 Aug 2014
+- Plug-in system is available
+- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
+- tar.gz export for repository contents
+- LDAP authentication improvement (mail address became optional)
+- Show news feed of a private repository to members
+- Some bug fix and improvements
+
+### 2.1 - 6 Jul 2014
+- Upgrade to Slick 2.0 from 1.9
+- Base part of the plug-in system is merged
+- Many bug fix and improvements
+
+### 2.0 - 31 May 2014
+- Modern Github UI
+- Preview in AceEditor
+- Select lines by clicking line number in blob view
+
+### 1.13 - 29 Apr 2014
+- Direct file editing in the repository viewer using AceEditor
+- File attachment for issues
+- Atom feed of user activity
+- Fix some bugs
+
 ### 1.12 - 29 Mar 2014
 - SSH repository access is available
 - Allow users can create and management their groups
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
  <property name="target.dir" value="target"/>
  <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
  <property name="jetty.dir" value="embed-jetty"/>
-  <property name="scala.version" value="2.10"/>
+  <property name="scala.version" value="2.11"/>
  <property name="gitbucket.version" value="0.0.1"/>
  <property name="jetty.version" value="8.1.8.v20121106"/>
  <property name="servlet.version" value="3.0.0.v201112011016"/>
@@ -50,8 +50,8 @@
  </target>

  <target name="rename" depends="embed">
-    <rename src="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
-            dest="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+    <move file="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+            tofile="${target.dir}/scala-${scala.version}/gitbucket.war"/>
  </target>

  <target name="all" depends="rename">
--- a/etc/icons.svg
+++ b/etc/icons.svg
@@ -2,6 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16,7 +17,16 @@
   inkscape:version="0.48.4 r9939"
   sodipodi:docname="icons.svg">
  <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       id="linearGradient4044"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4046" />
+    </linearGradient>
+  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
@@ -24,15 +34,15 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="450.21999"
-     inkscape:cy="97.51519"
+     inkscape:zoom="0.7"
+     inkscape:cx="482.58197"
+     inkscape:cy="-83.92636"
     inkscape:document-units="px"
     inkscape:current-layer="layer1-9"
     showgrid="false"
     inkscape:window-width="1366"
-     inkscape:window-height="706"
-     inkscape:window-x="1912"
+     inkscape:window-height="715"
+     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:snap-global="false"
@@ -978,6 +988,716 @@
         id="path4310"
         inkscape:connector-curvature="0"
         sodipodi:nodetypes="ccscc" />
+      <path
+         id="path2991-7-1-4"
+         transform="translate(668.66057,1115.0272)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-5-8"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,711.41194,1163.4493)" />
+      <rect
+         id="rect2995-0-2-8"
+         y="1378.4849"
+         x="916.58545"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.93666755999999995" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 884.0251,1366.2678 -64.6851,-36.2114 10.70013,55.9569 53.98497,-19.7455 z"
+         id="rect4046-3-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.98877633;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 873.36878,1359.3959 -43.65605,-24.4345 6.99871,38.1562 36.65734,-13.7217 z"
+         id="rect4046-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#b3b3b3;stroke-width:13.63542366;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 1162.2186,1316.0972 c -0.2525,22.2049 -0.505,44.4098 -0.7575,66.6147 3.3299,0.032 6.6599,0.063 9.9898,0.095 -2.3515,2.3672 -4.703,4.7345 -7.0544,7.1018 31.3741,31.374 62.7482,62.7482 94.1223,94.1223 23.3412,-23.3412 46.6824,-46.6824 70.0236,-70.0236 -31.3741,-31.3899 -62.7483,-62.7798 -94.1224,-94.1697 -2.6197,2.6356 -5.2395,5.2711 -7.8593,7.9067 0.032,-3.6298 0.063,-7.2596 0.095,-10.8894 -21.4789,-0.2525 -42.9579,-0.505 -64.4368,-0.7575 z"
+         id="rect3075-11"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect2995-0-2-8-6"
+         y="899.99463"
+         x="-1417.3273"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.93666755999999995"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:10.37699986;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 1172.5522,1326.6744 c -0.1922,16.8985 -0.3844,33.7973 -0.5765,50.6959 2.5342,0.024 5.0684,0.047 7.6026,0.072 -1.7896,1.8014 -3.5792,3.6031 -5.3686,5.4047 23.8766,23.8766 47.7533,47.7533 71.63,71.6301 17.7636,-17.7634 35.5269,-35.5268 53.2902,-53.2902 -23.8766,-23.8888 -47.7534,-47.7775 -71.6302,-71.6662 -1.9936,2.0058 -3.9873,4.0114 -5.9811,6.0172 0.024,-2.7624 0.047,-5.5247 0.072,-8.2872 -16.3463,-0.1921 -32.6925,-0.3843 -49.0386,-0.5764 z"
+         id="rect3075-11-7"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:6.57334423;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+         id="path3100-2"
+         sodipodi:cx="700"
+         sodipodi:cy="812.36218"
+         sodipodi:rx="10"
+         sodipodi:ry="10"
+         d="m 710,812.36218 c 0,5.52285 -4.47715,10 -10,10 -5.52285,0 -10,-4.47715 -10,-10 0,-5.52284 4.47715,-10 10,-10 5.52285,0 10,4.47716 10,10 z"
+         transform="matrix(1.2362333,-1.2362333,1.2362333,1.2362333,-667.98357,1217.7251)" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#b3b3b3;stroke-width:10.80681515;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4114"
+         width="45.086407"
+         height="62.401226"
+         x="-133.16023"
+         y="1850.2394"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <path
+         id="path2991-7-6"
+         transform="translate(1090.5728,-207.2632)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#a0a0a0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-8"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,1133.3242,-158.84107)" />
+      <rect
+         id="rect2995-0-8"
+         y="10.829478"
+         x="1332.5247"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#a0a0a0;stroke:#ffffff;stroke-width:1.11112404000000000;fill-opacity:1" />
+      <rect
+         id="rect2997-9-2"
+         y="129.62337"
+         x="1332.7828"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#a0a0a0;stroke:#ffffff;stroke-width:0.57680577000000000;fill-opacity:1" />
+      <g
+         id="g4284-1"
+         transform="translate(670.07237,-816.24186)"
+         style="stroke:#a0a0a0;stroke-opacity:1">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201-26"
+           d="m 568.37427,1080.8464 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43273,8.6574 40.43273,8.6574 l 0,141.4674 c 0,0 -20.97035,-7.7215 -40.43273,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:14.36538028999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203-0"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-4"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3-9"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245-4"
+           d="m 563.55369,1233.6274 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29117,14.7566 46.29117,14.7566"
+           style="fill:#b3b3b3;stroke:#a0a0a0;stroke-width:19.63722609999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <g
+           transform="matrix(-1.0032405,0,0,1,1329.8708,99.560238)"
+           id="g4277-6"
+           style="stroke:#a0a0a0;stroke-opacity:1">
+          <path
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:14.36538124000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 519.67634,980.83663 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43272,8.6574 40.43272,8.6574 l 0,141.46737 c 0,0 -20.97034,-7.7215 -40.43272,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+             id="rect4201-2-0"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-21-3"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-2-6-6"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-2-3-8-2"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#a0a0a0;stroke-width:19.63722609999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 514.85576,1133.6176 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29116,14.7566 46.29116,14.7566"
+             id="path4245-5-4"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1-1"
+         d="m 1409.5992,670.87038 0,-128.57724 c 0,0 1.8599,-15.30681 -16.7384,-15.30681 -18.5984,0 -51.1454,0 -51.1454,0"
+         style="fill:none;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="547.80316"
+         x="1294.749"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-7"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,944.16607,536.33294)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-4"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,942.63054,386.00935)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-0"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1056.9547,536.43446)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0-2-9"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4-4"
+         d="m 1369.3146,490.2451 0,70.69144 -45.5889,-32.13462 z"
+         style="fill:#a0a0a0;stroke:#a0a0a0;stroke-width:0.83335358000000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953"
+         width="15.304287"
+         height="97.947441"
+         x="1474.2273"
+         y="-367.14282"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-8"
+         width="15.304287"
+         height="97.947441"
+         x="-281.45197"
+         y="-1573.058"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82"
+         width="15.304287"
+         height="97.947441"
+         x="-412.46057"
+         y="-1617.4926"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-4"
+         width="15.304287"
+         height="97.947441"
+         x="-1617.2937"
+         y="306.0546"
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+      <g
+         id="g4016"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,3107.8871,982.01044)">
+        <rect
+           transform="scale(-1,-1)"
+           y="-1119.1083"
+           x="-1370.8767"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-4"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-1207.0963"
+           x="-1358.6217"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-0"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           transform="matrix(1.5972925,0,0,1.509886,-99.098035,-27.987625)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.14799976;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(1.1933397,0,0,1.5429659,269.38527,-37.350485)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-9"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           sodipodi:type="arc" />
+      </g>
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect4027"
+         width="73.460579"
+         height="107.13"
+         x="1722.2299"
+         y="-207.2868"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <g
+         id="g4022"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,1095.262,-713.65443)">
+        <rect
+           transform="scale(-1,-1)"
+           y="-1121.4039"
+           x="-1505.5544"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-1222.4006"
+           x="-1494.0955"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect3182"
+           d="m 1469.5507,1220.8203 20.5952,52.7426 20.6425,-52.7426 -2.0832,-5.35 -37.0713,0 -2.0832,5.35 z"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.02416945;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         id="path2991-7-6-1"
+         transform="translate(1482.3625,-199.43254)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-8-7"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#3c3c80;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,1525.1139,-151.0104)" />
+      <rect
+         id="rect2995-0-8-4"
+         y="18.660131"
+         x="1724.3145"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#ffffff;stroke-width:1.11112404000000000" />
+      <rect
+         id="rect2997-9-2-0"
+         y="137.45401"
+         x="1724.5726"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#ffffff;stroke-width:0.57680577000000000" />
+      <g
+         id="g4284-1-9"
+         transform="translate(1061.8621,-808.41119)"
+         style="stroke:#3c3c3c;stroke-opacity:1">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201-26-4"
+           d="m 568.37427,1080.8464 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43273,8.6574 40.43273,8.6574 l 0,141.4674 c 0,0 -20.97035,-7.7215 -40.43273,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:14.36538028999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203-0-8"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-4-8"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3-9-2"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245-4-4"
+           d="m 563.55369,1233.6274 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29117,14.7566 46.29117,14.7566"
+           style="fill:#b3b3b3;stroke:#3c3c3c;stroke-width:19.63722609999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <g
+           transform="matrix(-1.0032405,0,0,1,1329.8708,99.560238)"
+           id="g4277-6-5"
+           style="stroke:#3c3c3c;stroke-opacity:1">
+          <path
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:14.36538124000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+             d="m 519.67634,980.83663 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43272,8.6574 40.43272,8.6574 l 0,141.46737 c 0,0 -20.97034,-7.7215 -40.43272,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+             id="rect4201-2-0-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-21-3-1"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-2-6-6-7"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-2-3-8-2-1"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#3c3c3c;stroke-width:19.63722609999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 514.85576,1133.6176 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29116,14.7566 46.29116,14.7566"
+             id="path4245-5-4-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1-1-5"
+         d="m 1801.3889,678.70099 0,-128.5772 c 0,0 1.8599,-15.3068 -16.7384,-15.3068 -18.5984,0 -51.1454,0 -51.1454,0"
+         style="fill:none;stroke:#3c3c3c;stroke-width:22.72570610000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="555.63385"
+         x="1686.5388"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-7-2"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1335.9558,544.16359)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-4-7"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1334.4203,393.83999)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-0-6"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1448.7444,544.26509)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0-2-9-1"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4-4-4"
+         d="m 1761.1043,498.07579 0,70.6914 -45.5889,-32.1346 z"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:0.83335358000000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-2"
+         width="15.304287"
+         height="97.947441"
+         x="1756.8015"
+         y="-638.64288"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-8-3"
+         width="15.304287"
+         height="97.947441"
+         x="-552.95203"
+         y="-1855.6323"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-2"
+         width="15.304287"
+         height="97.947441"
+         x="-683.96063"
+         y="-1900.0669"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-4-2"
+         width="15.304287"
+         height="97.947441"
+         x="-1899.8679"
+         y="577.55469"
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+      <g
+         id="g4138">
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="2055.4602"
+           x="403.84506"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-4-6"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:16.74562263000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="1967.4722"
+           x="416.10007"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-0-8"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:9.11664103999999930;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           transform="matrix(-1.1294564,1.1294564,-1.0676506,-1.0676506,3589.5398,939.55844)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-5"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:7.14799976000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(-0.84381859,0.84381859,-1.0910416,-1.0910416,3335.6033,1206.736)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-9-7"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           sodipodi:type="arc" />
+        <rect
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+           y="-476.95105"
+           x="2003.8865"
+           height="107.13"
+           width="73.460579"
+           id="rect4027-6"
+           style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        <rect
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+           y="429.19318"
+           x="-2057.9661"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-8"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:16.74562263000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+           y="328.19647"
+           x="-2046.5071"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-9"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:9.11664103999999930;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect3182-2"
+           d="m 1662.9307,1196.5558 -22.7317,51.8577 51.8911,-22.6982 2.31,-5.2561 -26.2134,-26.2134 -5.256,2.31 z"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:7.02416944999999960;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         id="path2991-7-1-4-1"
+         transform="translate(-154.10522,1432.0357)"
+         d="m 359.99999,290.93362 a 104.28571,104.28571 0 1 1 -208.57142,0 104.28571,104.28571 0 1 1 208.57142,0 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#bebeff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-5-8-7"
+         d="m 359.99999,290.93362 a 104.28571,104.28571 0 1 1 -208.57142,0 104.28571,104.28571 0 1 1 208.57142,0 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,-111.35384,1480.4578)" />
+      <rect
+         id="rect2995-0-2-8-4"
+         y="1695.4933"
+         x="93.81971"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#bebefa;stroke:none;fill-opacity:1" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 61.259358,1683.2763 -64.6850999,-36.2114 10.7001,55.9569 53.9849999,-19.7455 z"
+         id="rect4046-3-4-0"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#bebeff;stroke:#bebeff;stroke-width:1.98877633000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1;stroke-opacity:1"
+         d="m 50.602958,1676.4044 -43.6559999,-24.4345 6.9986999,38.1562 36.6573,-13.7217 z"
+         id="rect4046-5-9"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#bebefa;stroke-width:13.63542366000000100;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 339.45286,1633.1057 c -0.2525,22.2049 -0.505,44.4098 -0.7575,66.6147 3.3299,0.032 6.6598,0.063 9.9898,0.095 -2.3515,2.3672 -4.703,4.7345 -7.0544,7.1018 31.3741,31.374 62.7482,62.7482 94.1222,94.1223 23.3413,-23.3412 46.6825,-46.6824 70.0237,-70.0236 -31.3741,-31.3899 -62.7483,-62.7798 -94.1224,-94.1697 -2.6197,2.6356 -5.2395,5.2711 -7.8593,7.9067 0.032,-3.6298 0.063,-7.2596 0.095,-10.8894 -21.4789,-0.2525 -42.9579,-0.505 -64.4368,-0.7575 z"
+         id="rect3075-11-4"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect2995-0-2-8-6-8"
+         y="77.228889"
+         x="-1734.3357"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#bebefa;stroke:none;fill-opacity:1"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:10.37699986;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 349.78646,1643.6829 c -0.1922,16.8985 -0.3844,33.7973 -0.5765,50.6959 2.5342,0.024 5.0684,0.047 7.6026,0.072 -1.7896,1.8014 -3.5792,3.6031 -5.3686,5.4047 23.8766,23.8766 47.7533,47.7533 71.63,71.6301 17.7636,-17.7634 35.5269,-35.5268 53.2902,-53.2902 -23.8766,-23.8888 -47.7534,-47.7775 -71.6302,-71.6662 -1.9936,2.0058 -3.9873,4.0114 -5.9811,6.0172 0.024,-2.7624 0.047,-5.5247 0.072,-8.2872 -16.3463,-0.1921 -32.6925,-0.3843 -49.0386,-0.5764 z"
+         id="rect3075-11-7-8"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#bebefa;stroke-width:6.57334423000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+         id="path3100-2-2"
+         sodipodi:cx="700"
+         sodipodi:cy="812.36218"
+         sodipodi:rx="10"
+         sodipodi:ry="10"
+         d="m 710,812.36218 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+         transform="matrix(1.2362333,-1.2362333,1.2362333,1.2362333,-1490.7493,1534.7336)" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#bebeff;stroke-width:10.80681515000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4114-4"
+         width="45.086407"
+         height="62.401226"
+         x="-939.10236"
+         y="1492.6151"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <path
+         style="fill:none;stroke:#bebeff;stroke-width:25.84518814000000100;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 655.10691,1790.494 c 0,0 3.44333,-28.5633 47.63498,-35.4849 15.10377,-2.3655 48.7968,-8.2798 48.7968,-42.5816"
+         id="path3207-5"
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="-9.2946303"
+         sodipodi:nodetypes="csc"
+         inkscape:transform-center-y="2.9369479e-005" />
+      <rect
+         y="1676.2623"
+         x="652.97418"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8-4-5"
+         style="fill:#ffffff;stroke:#bebefa;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,302.39116,1664.7945)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-8-1"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,300.85563,1514.4712)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-7"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,401.70879,1561.5007)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-2-1"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
    </g>
  </g>
 </svg>
--- a/project/build.scala
+++ b/project/build.scala
@@ -8,13 +8,14 @@ object MyBuild extends Build {
  val Organization = "jp.sf.amateras"
  val Name = "gitbucket"
  val Version = "0.0.1"
-  val ScalaVersion = "2.10.3"
-  val ScalatraVersion = "2.2.1"
+  val ScalaVersion = "2.11.2"
+  val ScalatraVersion = "2.3.0"

  lazy val project = Project (
    "gitbucket",
    file("."),
    settings = Defaults.defaultSettings ++ ScalatraPlugin.scalatraWithJRebel ++ Seq(
+      sourcesInBase := false,
      organization := Organization,
      name := Name,
      version := Version,
@@ -25,21 +26,24 @@ object MyBuild extends Build {
      ),
      scalacOptions := Seq("-deprecation", "-language:postfixOps"),
      libraryDependencies ++= Seq(
-        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.0.0.201306101825-r",
+        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.1.201406201815-r",
+        "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.1.201406201815-r",
        "org.scalatra" %% "scalatra" % ScalatraVersion,
        "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
        "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-        "org.json4s" %% "json4s-jackson" % "3.2.5",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
+        "org.json4s" %% "json4s-jackson" % "3.2.10",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
        "commons-io" % "commons-io" % "2.4",
        "org.pegdown" % "pegdown" % "1.4.1",
        "org.apache.commons" % "commons-compress" % "1.5",
        "org.apache.commons" % "commons-email" % "1.3.1",
        "org.apache.httpcomponents" % "httpclient" % "4.3",
-        "org.apache.sshd" % "apache-sshd" % "0.10.0",
-        "com.typesafe.slick" %% "slick" % "1.0.1",
+        "org.apache.sshd" % "apache-sshd" % "0.11.0",
+        "com.typesafe.slick" %% "slick" % "2.1.0-RC3",
+        "org.mozilla" % "rhino" % "1.7R4",
        "com.novell.ldap" % "jldap" % "2009-10-07",
-        "com.h2database" % "h2" % "1.3.173",
+        "org.quartz-scheduler" % "quartz" % "2.2.1",
+        "com.h2database" % "h2" % "1.4.180",
        "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
--- a/src/main/resources/update/1_0.sql
+++ b/src/main/resources/update/1_0.sql
@@ -1,135 +1,135 @@
-CREATE TABLE ACCOUNT(
-		USER_NAME VARCHAR(100) NOT NULL,
-		MAIL_ADDRESS VARCHAR(100) NOT NULL,
-		PASSWORD VARCHAR(40) NOT NULL,
-		ADMINISTRATOR BOOLEAN NOT NULL,
-		URL VARCHAR(200),
-		REGISTERED_DATE TIMESTAMP NOT NULL,
-		UPDATED_DATE TIMESTAMP NOT NULL,
-		LAST_LOGIN_DATE TIMESTAMP
-);
-
-CREATE TABLE REPOSITORY(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		PRIVATE BOOLEAN NOT NULL,
-		DESCRIPTION TEXT,
-		DEFAULT_BRANCH VARCHAR(100),
-		REGISTERED_DATE TIMESTAMP NOT NULL,
-		UPDATED_DATE TIMESTAMP NOT NULL,
-		LAST_ACTIVITY_DATE TIMESTAMP NOT NULL
-);
-
-CREATE TABLE COLLABORATOR(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		COLLABORATOR_NAME VARCHAR(100) NOT NULL
-);
-
-CREATE TABLE ISSUE(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		ISSUE_ID INT NOT NULL,
-		OPENED_USER_NAME VARCHAR(100) NOT NULL,
-		MILESTONE_ID INT,
-		ASSIGNED_USER_NAME VARCHAR(100),
-		TITLE TEXT NOT NULL,
-		CONTENT TEXT,
-		CLOSED BOOLEAN NOT NULL,
-		REGISTERED_DATE TIMESTAMP NOT NULL,
-		UPDATED_DATE TIMESTAMP NOT NULL
-);
-
-CREATE TABLE ISSUE_ID(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		ISSUE_ID INT NOT NULL
-);
-
-CREATE TABLE ISSUE_COMMENT(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		ISSUE_ID INT NOT NULL,
-		COMMENT_ID INT AUTO_INCREMENT,
-		ACTION VARCHAR(10),
-		COMMENTED_USER_NAME VARCHAR(100) NOT NULL,
-		CONTENT TEXT NOT NULL,
-		REGISTERED_DATE TIMESTAMP NOT NULL,
-		UPDATED_DATE TIMESTAMP NOT NULL
-);
-
-CREATE TABLE LABEL(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		LABEL_ID INT AUTO_INCREMENT,
-		LABEL_NAME VARCHAR(100) NOT NULL,
-		COLOR CHAR(6) NOT NULL
-);
-
-CREATE TABLE ISSUE_LABEL(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		ISSUE_ID INT NOT NULL,
-		LABEL_ID INT NOT NULL
-);
-
-CREATE TABLE MILESTONE(
-		USER_NAME VARCHAR(100) NOT NULL,
-		REPOSITORY_NAME VARCHAR(100) NOT NULL,
-		MILESTONE_ID INT AUTO_INCREMENT,
-		TITLE VARCHAR(100) NOT NULL,
-		DESCRIPTION TEXT,
-		DUE_DATE TIMESTAMP,
-		CLOSED_DATE TIMESTAMP
-);
-
-ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_PK PRIMARY KEY (USER_NAME);
-ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_1 UNIQUE (MAIL_ADDRESS);
-
-ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
-ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);
-
-ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
-ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
-ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK1 FOREIGN KEY (COLLABORATOR_NAME) REFERENCES ACCOUNT (USER_NAME);
-
-ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_PK PRIMARY KEY (ISSUE_ID, USER_NAME, REPOSITORY_NAME);
-ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
-ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK1 FOREIGN KEY (OPENED_USER_NAME) REFERENCES ACCOUNT (USER_NAME);
-ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK2 FOREIGN KEY (MILESTONE_ID) REFERENCES MILESTONE (MILESTONE_ID);
-
-ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
-ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_FK1 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
-
-ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_PK PRIMARY KEY (COMMENT_ID);
-ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_1 UNIQUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID, COMMENT_ID);
-ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
-
-ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, LABEL_ID);
-ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
-
-ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID, LABEL_ID);
-ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
-
-ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, MILESTONE_ID);
-ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
-
-INSERT INTO ACCOUNT (
-  USER_NAME,
-  MAIL_ADDRESS,
-  PASSWORD,
-  ADMINISTRATOR,
-  URL,
-  REGISTERED_DATE,
-  UPDATED_DATE,
-  LAST_LOGIN_DATE
-) VALUES (
-  'root',
-  'root@localhost',
-  'dc76e9f0c0006e8f919e0c515c66dbba3982f785',
-  true,
-  'https://github.com/takezoe/gitbucket',
-  SYSDATE,
-  SYSDATE,
-  NULL
-);
+CREATE TABLE ACCOUNT(
+		USER_NAME VARCHAR(100) NOT NULL,
+		MAIL_ADDRESS VARCHAR(100) NOT NULL,
+		PASSWORD VARCHAR(40) NOT NULL,
+		ADMINISTRATOR BOOLEAN NOT NULL,
+		URL VARCHAR(200),
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL,
+		LAST_LOGIN_DATE TIMESTAMP
+);
+
+CREATE TABLE REPOSITORY(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		PRIVATE BOOLEAN NOT NULL,
+		DESCRIPTION TEXT,
+		DEFAULT_BRANCH VARCHAR(100),
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL,
+		LAST_ACTIVITY_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE COLLABORATOR(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		COLLABORATOR_NAME VARCHAR(100) NOT NULL
+);
+
+CREATE TABLE ISSUE(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		OPENED_USER_NAME VARCHAR(100) NOT NULL,
+		MILESTONE_ID INT,
+		ASSIGNED_USER_NAME VARCHAR(100),
+		TITLE TEXT NOT NULL,
+		CONTENT TEXT,
+		CLOSED BOOLEAN NOT NULL,
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE ISSUE_ID(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL
+);
+
+CREATE TABLE ISSUE_COMMENT(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		COMMENT_ID INT AUTO_INCREMENT,
+		ACTION VARCHAR(10),
+		COMMENTED_USER_NAME VARCHAR(100) NOT NULL,
+		CONTENT TEXT NOT NULL,
+		REGISTERED_DATE TIMESTAMP NOT NULL,
+		UPDATED_DATE TIMESTAMP NOT NULL
+);
+
+CREATE TABLE LABEL(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		LABEL_ID INT AUTO_INCREMENT,
+		LABEL_NAME VARCHAR(100) NOT NULL,
+		COLOR CHAR(6) NOT NULL
+);
+
+CREATE TABLE ISSUE_LABEL(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		LABEL_ID INT NOT NULL
+);
+
+CREATE TABLE MILESTONE(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		MILESTONE_ID INT AUTO_INCREMENT,
+		TITLE VARCHAR(100) NOT NULL,
+		DESCRIPTION TEXT,
+		DUE_DATE TIMESTAMP,
+		CLOSED_DATE TIMESTAMP
+);
+
+ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_PK PRIMARY KEY (USER_NAME);
+ALTER TABLE ACCOUNT ADD CONSTRAINT IDX_ACCOUNT_1 UNIQUE (MAIL_ADDRESS);
+
+ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE REPOSITORY ADD CONSTRAINT IDX_REPOSITORY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE COLLABORATOR ADD CONSTRAINT IDX_COLLABORATOR_FK1 FOREIGN KEY (COLLABORATOR_NAME) REFERENCES ACCOUNT (USER_NAME);
+
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_PK PRIMARY KEY (ISSUE_ID, USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK1 FOREIGN KEY (OPENED_USER_NAME) REFERENCES ACCOUNT (USER_NAME);
+ALTER TABLE ISSUE ADD CONSTRAINT IDX_ISSUE_FK2 FOREIGN KEY (MILESTONE_ID) REFERENCES MILESTONE (MILESTONE_ID);
+
+ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME);
+ALTER TABLE ISSUE_ID ADD CONSTRAINT IDX_ISSUE_ID_FK1 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_PK PRIMARY KEY (COMMENT_ID);
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_1 UNIQUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID, COMMENT_ID);
+ALTER TABLE ISSUE_COMMENT ADD CONSTRAINT IDX_ISSUE_COMMENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, LABEL_ID);
+ALTER TABLE LABEL ADD CONSTRAINT IDX_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID, LABEL_ID);
+ALTER TABLE ISSUE_LABEL ADD CONSTRAINT IDX_ISSUE_LABEL_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, MILESTONE_ID);
+ALTER TABLE MILESTONE ADD CONSTRAINT IDX_MILESTONE_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);
+
+INSERT INTO ACCOUNT (
+  USER_NAME,
+  MAIL_ADDRESS,
+  PASSWORD,
+  ADMINISTRATOR,
+  URL,
+  REGISTERED_DATE,
+  UPDATED_DATE,
+  LAST_LOGIN_DATE
+) VALUES (
+  'root',
+  'root@localhost',
+  'dc76e9f0c0006e8f919e0c515c66dbba3982f785',
+  true,
+  'https://github.com/takezoe/gitbucket',
+  SYSDATE,
+  SYSDATE,
+  NULL
+);
--- a/src/main/resources/update/1_13.sql
+++ b/src/main/resources/update/1_13.sql
@@ -0,0 +1 @@
+DROP TABLE COMMIT_LOG;
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -1,6 +1,6 @@
-import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter}
+import _root_.servlet.{PluginActionInvokeFilter, BasicAuthenticationFilter, TransactionFilter}
 import app._
-import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
+//import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 import org.scalatra._
 import javax.servlet._
 import java.util.EnumSet
@@ -10,6 +10,8 @@ class ScalatraBootstrap extends LifeCycle {
    // Register TransactionFilter and BasicAuthenticationFilter at first
    context.addFilter("transactionFilter", new TransactionFilter)
    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context.addFilter("pluginActionInvokeFilter", new PluginActionInvokeFilter)
+    context.getFilterRegistration("pluginActionInvokeFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
    context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter)
    context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")

@@ -28,7 +30,6 @@ class ScalatraBootstrap extends LifeCycle {
    context.mount(new IssuesController, "/*")
    context.mount(new PullRequestsController, "/*")
    context.mount(new RepositorySettingsController, "/*")
-    context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")

    // Create GITBUCKET_HOME directory if it does not exist
    val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -5,6 +5,8 @@ import util._
 import util.StringUtil._
 import util.Directory._
 import util.ControlUtil._
+import util.Implicits._
+import ssh.SshUtil
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
@@ -49,7 +51,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  val sshKeyForm = mapping(
    "title"     -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey" -> trim(label("Key"  , text(required)))
+    "publicKey" -> trim(label("Key"  , text(required, validPublicKey)))
  )(SshKeyForm.apply)

  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
@@ -111,13 +113,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
          val members = getGroupMembers(account.userName)
          _root_.account.html.repositories(account,
            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)),
+            getVisibleRepositories(context.loginAccount, context.baseUrl, Some(userName)),
            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
        }
      }
    } getOrElse NotFound
  }

+  get("/:userName.atom") {
+    val userName = params("userName")
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getActivitiesByUser(userName, true))
+  }
+
  get("/:userName/_avatar"){
    val userName = params("userName")
    getAccountByUserName(userName).flatMap(_.image).map { image =>
@@ -284,8 +292,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   * Create new repository.
   */
  post("/new", newRepositoryForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}/create"){
-      if(getRepository(form.owner, form.name, baseUrl).isEmpty){
+    LockUtil.lock(s"${form.owner}/${form.name}"){
+      if(getRepository(form.owner, form.name, context.baseUrl).isEmpty){
        val ownerAccount  = getAccountByUserName(form.owner).get
        val loginAccount  = context.loginAccount.get
        val loginUserName = loginAccount.userName
@@ -347,62 +355,43 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    val loginAccount   = context.loginAccount.get
    val loginUserName  = loginAccount.userName

-    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
-      if(repository.owner == loginUserName){
-        // redirect to the repository
-        redirect(s"/${repository.owner}/${repository.name}")
+    LockUtil.lock(s"${loginUserName}/${repository.name}"){
+      if(repository.owner == loginUserName || getRepository(loginAccount.userName, repository.name, baseUrl).isDefined){
+        // redirect to the repository if repository already exists
+        redirect(s"/${loginUserName}/${repository.name}")
      } else {
-        getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) =>
-          // redirect to the repository
-          redirect(s"/${owner}/${name}")
-        } getOrElse {
-          // Insert to the database at first
-          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
-          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+        // Insert to the database at first
+        val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+        val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)

-          createRepository(
-            repositoryName       = repository.name,
-            userName             = loginUserName,
-            description          = repository.repository.description,
-            isPrivate            = repository.repository.isPrivate,
-            originRepositoryName = Some(originRepositoryName),
-            originUserName       = Some(originUserName),
-            parentRepositoryName = Some(repository.name),
-            parentUserName       = Some(repository.owner)
-          )
+        createRepository(
+          repositoryName       = repository.name,
+          userName             = loginUserName,
+          description          = repository.repository.description,
+          isPrivate            = repository.repository.isPrivate,
+          originRepositoryName = Some(originRepositoryName),
+          originUserName       = Some(originUserName),
+          parentRepositoryName = Some(repository.name),
+          parentUserName       = Some(repository.owner)
+        )

-          // Insert default labels
-          insertDefaultLabels(loginUserName, repository.name)
+        // Insert default labels
+        insertDefaultLabels(loginUserName, repository.name)

-          // clone repository actually
-          JGitUtil.cloneRepository(
-            getRepositoryDir(repository.owner, repository.name),
-            getRepositoryDir(loginUserName, repository.name))
+        // clone repository actually
+        JGitUtil.cloneRepository(
+          getRepositoryDir(repository.owner, repository.name),
+          getRepositoryDir(loginUserName, repository.name))

-          // Create Wiki repository
-          JGitUtil.cloneRepository(
-            getWikiRepositoryDir(repository.owner, repository.name),
-            getWikiRepositoryDir(loginUserName, repository.name))
+        // Create Wiki repository
+        JGitUtil.cloneRepository(
+          getWikiRepositoryDir(repository.owner, repository.name),
+          getWikiRepositoryDir(loginUserName, repository.name))

-          // insert commit id
-          using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
-            JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
-              JGitUtil.getCommitLog(git, branch) match {
-                case Right((commits, _)) => commits.foreach { commit =>
-                  if(!existsCommitId(loginUserName, repository.name, commit.id)){
-                    insertCommitId(loginUserName, repository.name, commit.id)
-                  }
-                }
-                case Left(_) => ???
-              }
-            }
-          }
-
-          // Record activity
-          recordForkActivity(repository.owner, repository.name, loginUserName)
-          // redirect to the repository
-          redirect(s"/${loginUserName}/${repository.name}")
-        }
+        // Record activity
+        recordForkActivity(repository.owner, repository.name, loginUserName)
+        // redirect to the repository
+        redirect(s"/${loginUserName}/${repository.name}")
      }
    }
  })
@@ -435,4 +424,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      }) None else Some("Must select one manager at least.")
    }
  }
+
+  private def validPublicKey: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
+     case Some(_) => None
+     case None => Some("Key is invalid.")
+    }
+  }
 }
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -9,10 +9,9 @@ import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import model.Account
+import model._
 import service.{SystemSettingsService, AccountService}
-import javax.servlet.http.{HttpServletResponse, HttpSession, HttpServletRequest}
-import java.text.SimpleDateFormat
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
 import org.scalatra.i18n._

@@ -25,8 +24,9 @@ abstract class ControllerBase extends ScalatraFilter

  implicit val jsonFormats = DefaultFormats

-  // Don't set content type via Accept header.
-  override def format(implicit request: HttpServletRequest) = ""
+// TODO Scala 2.11
+//  // Don't set content type via Accept header.
+//  override def format(implicit request: HttpServletRequest) = ""

  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
    val httpRequest  = request.asInstanceOf[HttpServletRequest]
@@ -126,11 +126,13 @@ abstract class ControllerBase extends ScalatraFilter
      }
    }

-  override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty,
-                       includeContextPath: Boolean = true, includeServletPath: Boolean = true)
-                      (implicit request: HttpServletRequest, response: HttpServletResponse) =
+  // TODO Scala 2.11
+  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+                   absolutize: Boolean = true, withSessionId: Boolean = true)
+                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
    if (path.startsWith("http")) path
-    else baseUrl + url(path, params, false, false, false)
+    else baseUrl + super.url(path, params, false, false, false)

 }

@@ -139,9 +141,10 @@ abstract class ControllerBase extends ScalatraFilter
 */
 case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){

-  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
-
-  lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
+  val path = settings.baseUrl.getOrElse(request.getContextPath)
+  val currentPath = request.getRequestURI.substring(request.getContextPath.length)
+  val baseUrl = settings.baseUrl(request)
+  val host = new java.net.URL(baseUrl).getHost

  /**
   * Get object from cache.
@@ -163,7 +166,7 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
 /**
 * Base trait for controllers which manages account information.
 */
-trait AccountManagementControllerBase extends ControllerBase with FileUploadControllerBase {
+trait AccountManagementControllerBase extends ControllerBase {
  self: AccountService  =>

  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
@@ -174,9 +177,9 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
      }
    } else {
      fileId.map { fileId =>
-        val filename = "avatar." + FileUtil.getExtension(getUploadedFilename(fileId).get)
+        val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
        FileUtils.moveFile(
-          getTemporaryFile(fileId),
+          new java.io.File(getTemporaryDir(session.getId), fileId),
          new java.io.File(getUserUploadDir(userName), filename)
        )
        updateAvatarImage(userName, Some(filename))
@@ -196,28 +199,3 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
  }

 }
-
-/**
- * Base trait for controllers which needs file uploading feature.
- */
-trait FileUploadControllerBase {
-
-  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] =
-    session.getAndRemove[String](Keys.Session.Upload(fileId))
-
-}
--- a/src/main/scala/app/DashboardController.scala
+++ b/src/main/scala/app/DashboardController.scala
@@ -1,109 +1,110 @@
-package app
-
-import service._
-import util.{UsersAuthenticator, Keys}
-import util.Implicits._
-
-class DashboardController extends DashboardControllerBase
-  with IssuesService with PullRequestService with RepositoryService with AccountService
-  with UsersAuthenticator
-
-trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
-
-  get("/dashboard/issues/repos")(usersOnly {
-    searchIssues("all")
-  })
-
-  get("/dashboard/issues/assigned")(usersOnly {
-    searchIssues("assigned")
-  })
-
-  get("/dashboard/issues/created_by")(usersOnly {
-    searchIssues("created_by")
-  })
-
-  get("/dashboard/pulls")(usersOnly {
-    searchPullRequests("created_by", None)
-  })
-
-  get("/dashboard/pulls/owned")(usersOnly {
-    searchPullRequests("created_by", None)
-  })
-
-  get("/dashboard/pulls/public")(usersOnly {
-    searchPullRequests("not_created_by", None)
-  })
-
-  get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
-    searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
-  })
-
-  private def searchIssues(filter: String) = {
-    import IssuesService._
-
-    // condition
-    val condition = session.putAndGet(Keys.Session.DashboardIssues,
-      if(request.hasQueryString) IssueSearchCondition(request)
-      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
-    )
-
-    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
-    val filterUser = Map(filter -> userName)
-    val page = IssueSearchCondition.page(request)
-    // 
-    dashboard.html.issues(
-        issues.html.listparts(
-            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
-            page,
-            countIssue(condition.copy(state = "open"), filterUser, false, repositories: _*),
-            countIssue(condition.copy(state = "closed"), filterUser, false, repositories: _*),
-            condition),
-        countIssue(condition, Map.empty, false, repositories: _*),
-        countIssue(condition, Map("assigned" -> userName), false, repositories: _*),
-        countIssue(condition, Map("created_by" -> userName), false, repositories: _*),
-        countIssueGroupByRepository(condition, filterUser, false, repositories: _*),
-        condition,
-        filter)    
-    
-  }
-
-  private def searchPullRequests(filter: String, repository: Option[String]) = {
-    import IssuesService._
-    import PullRequestService._
-
-    // condition
-    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
-      if(request.hasQueryString) IssueSearchCondition(request)
-      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
-    }.copy(repo = repository))
-
-    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
-    val filterUser = Map(filter -> userName)
-    val page = IssueSearchCondition.page(request)
-
-    val counts = countIssueGroupByRepository(
-      IssueSearchCondition().copy(state = condition.state), Map.empty, true, repositories: _*)
-
-    dashboard.html.pulls(
-      pulls.html.listparts(
-        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),
-        page,
-        countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
-        countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
-        condition,
-        None,
-        false),
-      getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
-      getRepositoryNamesOfUser(userName).map { RepoName =>
-        (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
-      }.sortBy(_._3).reverse,
-      condition,
-      filter)
-
-  }
-
-
-}
+package app
+
+import service._
+import util.{UsersAuthenticator, Keys}
+import util.Implicits._
+
+class DashboardController extends DashboardControllerBase
+  with IssuesService with PullRequestService with RepositoryService with AccountService
+  with UsersAuthenticator
+
+trait DashboardControllerBase extends ControllerBase {
+  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
+
+  get("/dashboard/issues/repos")(usersOnly {
+    searchIssues("all")
+  })
+
+  get("/dashboard/issues/assigned")(usersOnly {
+    searchIssues("assigned")
+  })
+
+  get("/dashboard/issues/created_by")(usersOnly {
+    searchIssues("created_by")
+  })
+
+  get("/dashboard/pulls")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/owned")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/public")(usersOnly {
+    searchPullRequests("not_created_by", None)
+  })
+
+  get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
+    searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
+  })
+
+  private def searchIssues(filter: String) = {
+    import IssuesService._
+
+    // condition
+    val condition = session.putAndGet(Keys.Session.DashboardIssues,
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
+    )
+
+    val userName   = context.loginAccount.get.userName
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    dashboard.html.issues(
+        issues.html.listparts(
+            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
+            page,
+            countIssue(condition.copy(state = "open"  ), filterUser, false, userRepos: _*),
+            countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
+            condition),
+        countIssue(condition, Map.empty, false, userRepos: _*),
+        countIssue(condition, Map("assigned"   -> userName), false, userRepos: _*),
+        countIssue(condition, Map("created_by" -> userName), false, userRepos: _*),
+        countIssueGroupByRepository(condition, filterUser, false, userRepos: _*),
+        condition,
+        filter)    
+    
+  }
+
+  private def searchPullRequests(filter: String, repository: Option[String]) = {
+    import IssuesService._
+    import PullRequestService._
+
+    // condition
+    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
+    }.copy(repo = repository))
+
+    val userName   = context.loginAccount.get.userName
+    val allRepos   = getAllRepositories()
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    val counts = countIssueGroupByRepository(
+      IssueSearchCondition().copy(state = condition.state), Map.empty, true, userRepos: _*)
+
+    dashboard.html.pulls(
+      pulls.html.listparts(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
+        page,
+        countIssue(condition.copy(state = "open"  ), filterUser, true, allRepos: _*),
+        countIssue(condition.copy(state = "closed"), filterUser, true, allRepos: _*),
+        condition,
+        None,
+        false),
+      getPullRequestCountGroupByUser(condition.state == "closed", None, None),
+      userRepos.map { case (userName, repoName) =>
+        (userName, repoName, counts.find { x => x._1 == userName && x._2 == repoName }.map(_._3).getOrElse(0))
+      }.sortBy(_._3).reverse,
+      condition,
+      filter)
+
+  }
+
+
+}
--- a/src/main/scala/app/FileUploadController.scala
+++ b/src/main/scala/app/FileUploadController.scala
@@ -1,31 +1,44 @@
 package app

-import _root_.util.{Keys, FileUtil}
+import util.{Keys, FileUtil}
 import util.ControlUtil._
+import util.Directory._
 import org.scalatra._
-import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
+import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
 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 [[app.FileUploadControllerBase#getTemporaryFile()]] with this id.
+ * This servlet saves uploaded file.
 */
-class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase {
+class FileUploadController extends ScalatraServlet with FileUploadSupport {

  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))

  post("/image"){
-    fileParams.get("file") match {
-      case Some(file) if(FileUtil.isImage(file.name)) => defining(generateFileId){ fileId =>
-        FileUtils.writeByteArrayToFile(getTemporaryFile(fileId), file.get)
-        session += Keys.Session.Upload(fileId) -> file.name
-        Ok(fileId)
-      }
-      case None => BadRequest
+    execute { (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      session += Keys.Session.Upload(fileId) -> file.name
    }
  }

-}
+  post("/image/:owner/:repository"){
+    execute { (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(
+        getAttachedDir(params("owner"), params("repository")),
+        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
+    }
+  }

+  private def execute(f: (FileItem, String) => Unit) = fileParams.get("file") match {
+    case Some(file) if(FileUtil.isImage(file.name)) =>
+      defining(FileUtil.generateFileId){ fileId =>
+        f(file, fileId)
+
+        Ok(fileId)
+      }
+    case _ => BadRequest
+  }
+
+}
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -1,80 +1,106 @@
-package app
-
-import util._
-import service._
-import jp.sf.amateras.scalatra.forms._
-
-class IndexController extends IndexControllerBase 
-  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
-
-trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
-
-  case class SignInForm(userName: String, password: String)
-
-  val form = mapping(
-    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
-  )(SignInForm.apply)
-
-  get("/"){
-    val loginAccount = context.loginAccount
-
-    html.index(getRecentActivities(),
-      getVisibleRepositories(loginAccount, baseUrl),
-      loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
-    )
-  }
-
-  get("/signin"){
-    val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
-      flash += Keys.Flash.Redirect -> redirect.get
-    }
-    html.signin()
-  }
-
-  post("/signin", form){ form =>
-    authenticate(context.settings, form.userName, form.password) match {
-      case Some(account) => signin(account)
-      case None          => redirect("/signin")
-    }
-  }
-
-  get("/signout"){
-    session.invalidate
-    redirect("/")
-  }
-
-  /**
-   * Set account information into HttpSession and redirect.
-   */
-  private def signin(account: model.Account) = {
-    session.setAttribute(Keys.Session.LoginAccount, account)
-    updateLastLoginDate(account.userName)
-
-    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
-      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
-        redirect("/")
-      } else {
-        redirect(redirectUrl)
-      }
-    }.getOrElse {
-      redirect("/")
-    }
-  }
-
-  /**
-   * JSON API for collaborator completion.
-   *
-   * TODO Move to other controller?
-   */
-  get("/_user/proposals")(usersOnly {
-    contentType = formats("json")
-    org.json4s.jackson.Serialization.write(
-      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
-    )
-  })
-
-
-}
+package app
+
+import util._
+import util.Implicits._
+import service._
+import jp.sf.amateras.scalatra.forms._
+
+class IndexController extends IndexControllerBase 
+  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
+
+trait IndexControllerBase extends ControllerBase {
+  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
+
+  case class SignInForm(userName: String, password: String)
+
+  val form = mapping(
+    "userName" -> trim(label("Username", text(required))),
+    "password" -> trim(label("Password", text(required)))
+  )(SignInForm.apply)
+
+  get("/"){
+    val loginAccount = context.loginAccount
+    if(loginAccount.isEmpty) {
+        html.index(getRecentActivities(),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil)
+        )
+    } else {
+        val loginUserName = loginAccount.get.userName
+        val loginUserGroups = getGroupsByUserName(loginUserName)
+        var visibleOwnerSet : Set[String] = Set(loginUserName)
+        
+        visibleOwnerSet ++= loginUserGroups
+
+        html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        )
+    }
+  }
+
+  get("/signin"){
+    val redirect = params.get("redirect")
+    if(redirect.isDefined && redirect.get.startsWith("/")){
+      flash += Keys.Flash.Redirect -> redirect.get
+    }
+    html.signin()
+  }
+
+  post("/signin", form){ form =>
+    authenticate(context.settings, form.userName, form.password) match {
+      case Some(account) => signin(account)
+      case None          => redirect("/signin")
+    }
+  }
+
+  get("/signout"){
+    session.invalidate
+    redirect("/")
+  }
+
+  get("/activities.atom"){
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getRecentActivities())
+  }
+
+  /**
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: model.Account) = {
+    session.setAttribute(Keys.Session.LoginAccount, account)
+    updateLastLoginDate(account.userName)
+
+    if(LDAPUtil.isDummyMailAddress(account)) {
+      redirect("/" + account.userName + "/_edit")
+    }
+
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.stripSuffix("/") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
+      redirect("/")
+    }
+  }
+
+  /**
+   * JSON API for collaborator completion.
+   */
+  get("/_user/proposals")(usersOnly {
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(
+      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
+    )
+  })
+
+  /**
+   * JSON APU for checking user existence.
+   */
+  post("/_user/existence")(usersOnly {
+    getAccountByUserName(params("userName")).isDefined
+  })
+
+}
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -1,392 +1,403 @@
-package app
-
-import jp.sf.amateras.scalatra.forms._
-
-import service._
-import IssuesService._
-import util._
-import util.Implicits._
-import util.ControlUtil._
-import org.scalatra.Ok
-import model.Issue
-
-class IssuesController extends IssuesControllerBase
-  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 AccountService 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))),
-      "content"          -> trim(optional(text())),
-      "assignedUserName" -> trim(optional(text())),
-      "milestoneId"      -> trim(optional(number())),
-      "labelNames"       -> trim(optional(text()))
-    )(IssueCreateForm.apply)
-
-  val issueEditForm = mapping(
-      "title"   -> trim(label("Title", text(required))),
-      "content" -> trim(optional(text()))
-    )(IssueEditForm.apply)
-
-  val commentForm = mapping(
-      "issueId" -> label("Issue Id", number()),
-      "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", _)
-  })
-
-  get("/:owner/:repository/issues/assigned/:userName")(referrersOnly {
-    searchIssues("assigned", _)
-  })
-
-  get("/:owner/:repository/issues/created_by/:userName")(referrersOnly {
-    searchIssues("created_by", _)
-  })
-
-  get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
-      getIssue(owner, name, issueId) map {
-        issues.html.issue(
-          _,
-          getComments(owner, name, issueId.toInt),
-          getIssueLabels(owner, name, issueId.toInt),
-          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
-          getMilestonesWithIssueCount(owner, name),
-          getLabels(owner, name),
-          hasWritePermission(owner, name, context.loginAccount),
-          repository)
-      } getOrElse NotFound
-    }
-  })
-
-  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
-      issues.html.create(
-        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
-          getMilestones(owner, name),
-          getLabels(owner, name),
-          hasWritePermission(owner, name, context.loginAccount),
-          repository)
-    }
-  })
-
-  post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
-      val writable = hasWritePermission(owner, name, context.loginAccount)
-      val userName = context.loginAccount.get.userName
-
-      // 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)
-          value.split(",").foreach { labelName =>
-            labels.find(_.labelName == labelName).map { label =>
-              registerIssueLabel(owner, name, issueId, label.labelId)
-            }
-          }
-        }
-      }
-
-      // record activity
-      recordCreateIssueActivity(owner, name, userName, issueId, form.title)
-
-      // extract references and create refer comment
-      getIssue(owner, name, issueId.toString).foreach { issue =>
-        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
-      }
-
-      // notifications
-      Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-        Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
-      }
-
-      redirect(s"/${owner}/${name}/issues/${issueId}")
-    }
-  })
-
-  ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
-      getIssue(owner, name, params("id")).map { issue =>
-        if(isEditable(owner, name, issue.openedUserName)){
-          // update issue
-          updateIssue(owner, name, issue.issueId, form.title, form.content)
-          // extract references and create refer comment
-          createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
-
-          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-        } else Unauthorized
-      } getOrElse NotFound
-    }
-  })
-
-  post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, Some(form.content), repository)() map { case (issue, id) =>
-      redirect(s"/${repository.owner}/${repository.name}/${
-        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
-    } getOrElse NotFound
-  })
-
-  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, form.content, repository)() map { case (issue, id) =>
-      redirect(s"/${repository.owner}/${repository.name}/${
-        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
-    } getOrElse NotFound
-  })
-
-  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
-      getComment(owner, name, params("id")).map { comment =>
-        if(isEditable(owner, name, comment.commentedUserName)){
-          updateComment(comment.commentId, form.content)
-          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
-        } else Unauthorized
-      } getOrElse NotFound
-    }
-  })
-
-  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name){ case (owner, name) =>
-      getComment(owner, name, params("id")).map { comment =>
-        if(isEditable(owner, name, comment.commentedUserName)){
-          Ok(deleteComment(comment.commentId))
-        } else Unauthorized
-      } getOrElse NotFound
-    }
-  })
-
-  ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    getIssue(repository.owner, repository.name, params("id")) map { x =>
-      if(isEditable(x.userName, x.repositoryName, x.openedUserName)){
-        params.get("dataType") collect {
-          case t if t == "html" => issues.html.editissue(
-              x.title, x.content, x.issueId, x.userName, x.repositoryName)
-        } getOrElse {
-          contentType = formats("json")
-          org.json4s.jackson.Serialization.write(
-              Map("title"   -> x.title,
-                  "content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
-                      repository, false, true)
-              ))
-        }
-      } else Unauthorized
-    } getOrElse NotFound
-  })
-
-  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    getComment(repository.owner, repository.name, params("id")) map { x =>
-      if(isEditable(x.userName, x.repositoryName, x.commentedUserName)){
-        params.get("dataType") collect {
-          case t if t == "html" => issues.html.editcomment(
-              x.content, x.commentId, x.userName, x.repositoryName)
-        } getOrElse {
-          contentType = formats("json")
-          org.json4s.jackson.Serialization.write(
-              Map("content" -> view.Markdown.toHtml(x.content,
-                  repository, false, true)
-              ))
-        }
-      } else Unauthorized
-    } getOrElse NotFound
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/label/new")(collaboratorsOnly { repository =>
-    defining(params("id").toInt){ issueId =>
-      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    }
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/label/delete")(collaboratorsOnly { repository =>
-    defining(params("id").toInt){ issueId =>
-      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    }
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
-    Ok("updated")
-  })
-
-  ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
-    milestoneId("milestoneId").map { milestoneId =>
-      getMilestonesWithIssueCount(repository.owner, repository.name)
-          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
-        issues.milestones.html.progress(openCount + closeCount, closeCount, false)
-      } getOrElse NotFound
-    } getOrElse Ok()
-  })
-
-  post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
-    defining(params.get("value")){ action =>
-      executeBatch(repository) {
-        handleComment(_, None, repository)( _ => action)
-      }
-    }
-  })
-
-  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    params("value").toIntOpt.map{ labelId =>
-      executeBatch(repository) { issueId =>
-        getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
-        }
-      }
-    } getOrElse NotFound
-  })
-
-  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
-    defining(assignedUserName("value")){ value =>
-      executeBatch(repository) {
-        updateAssignedUserName(repository.owner, repository.name, _, value)
-      }
-    }
-  })
-
-  post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
-    defining(milestoneId("value")){ value =>
-      executeBatch(repository) {
-        updateMilestoneId(repository.owner, repository.name, _, value)
-      }
-    }
-  })
-
-  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
-  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
-
-  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")
-  }
-
-  private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = {
-    StringUtil.extractIssueId(message).foreach { issueId =>
-      if(getIssue(owner, repository, issueId).isDefined){
-        createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt,
-                      fromIssue.issueId + ":" + fromIssue.title, "refer")
-      }
-    }
-  }
-
-  /**
-   * @see [[https://github.com/takezoe/gitbucket/wiki/CommentAction]]
-   */
-  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))) = {
-
-    defining(repository.owner, repository.name){ case (owner, 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(if(issue.isPullRequest) recordClosePullRequestActivity _ else 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 {
-          (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
-          (owner, name, userName, issueId, _)
-        }
-        recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
-
-        // extract references and create refer comment
-        content.map { content =>
-          createReferComment(owner, name, issue, content)
-        }
-
-        // notifications
-        Notifier() match {
-          case f =>
-            content foreach {
-              f.toNotify(repository, issueId, _){
-                Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
-                  if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
-              }
-            }
-            action foreach {
-              f.toNotify(repository, issueId, _){
-                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
-              }
-            }
-        }
-
-        issue -> commentId
-      }
-    }
-  }
-
-  private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
-    defining(repository.owner, repository.name){ case (owner, repoName) =>
-      val filterUser = Map(filter -> params.getOrElse("userName", ""))
-      val page       = IssueSearchCondition.page(request)
-      val sessionKey = Keys.Session.Issues(owner, repoName)
-
-      // retrieve search condition
-      val condition = session.putAndGet(sessionKey,
-        if(request.hasQueryString) IssueSearchCondition(request)
-        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
-      )
-
-      issues.html.list(
-          searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
-          page,
-          (getCollaborators(owner, repoName) :+ owner).sorted,
-          getMilestones(owner, repoName),
-          getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName),
-          countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName),
-          countIssue(condition, Map.empty, false, owner -> repoName),
-          context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)),
-          context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)),
-          countIssueGroupByLabels(owner, repoName, condition, filterUser),
-          condition,
-          filter,
-          repository,
-          hasWritePermission(owner, repoName, context.loginAccount))
-    }
-  }
-
-}
+package app
+
+import jp.sf.amateras.scalatra.forms._
+
+import service._
+import IssuesService._
+import util._
+import util.Implicits._
+import util.ControlUtil._
+import org.scalatra.Ok
+import model.Issue
+
+class IssuesController extends IssuesControllerBase
+  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 AccountService 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))),
+      "content"          -> trim(optional(text())),
+      "assignedUserName" -> trim(optional(text())),
+      "milestoneId"      -> trim(optional(number())),
+      "labelNames"       -> trim(optional(text()))
+    )(IssueCreateForm.apply)
+
+  val issueEditForm = mapping(
+      "title"   -> trim(label("Title", text(required))),
+      "content" -> trim(optional(text()))
+    )(IssueEditForm.apply)
+
+  val commentForm = mapping(
+      "issueId" -> label("Issue Id", number()),
+      "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", _)
+  })
+
+  get("/:owner/:repository/issues/assigned/:userName")(referrersOnly {
+    searchIssues("assigned", _)
+  })
+
+  get("/:owner/:repository/issues/created_by/:userName")(referrersOnly {
+    searchIssues("created_by", _)
+  })
+
+  get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
+    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
+      getIssue(owner, name, issueId) map {
+        issues.html.issue(
+          _,
+          getComments(owner, name, issueId.toInt),
+          getIssueLabels(owner, name, issueId.toInt),
+          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+          getMilestonesWithIssueCount(owner, name),
+          getLabels(owner, name),
+          hasWritePermission(owner, name, context.loginAccount),
+          repository)
+      } getOrElse NotFound
+    }
+  })
+
+  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      issues.html.create(
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+          getMilestones(owner, name),
+          getLabels(owner, name),
+          hasWritePermission(owner, name, context.loginAccount),
+          repository)
+    }
+  })
+
+  post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      val writable = hasWritePermission(owner, name, context.loginAccount)
+      val userName = context.loginAccount.get.userName
+
+      // 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)
+          value.split(",").foreach { labelName =>
+            labels.find(_.labelName == labelName).map { label =>
+              registerIssueLabel(owner, name, issueId, label.labelId)
+            }
+          }
+        }
+      }
+
+      // record activity
+      recordCreateIssueActivity(owner, name, userName, issueId, form.title)
+
+      // extract references and create refer comment
+      getIssue(owner, name, issueId.toString).foreach { issue =>
+        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
+      }
+
+      // notifications
+      Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
+        Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
+      }
+
+      redirect(s"/${owner}/${name}/issues/${issueId}")
+    }
+  })
+
+  ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getIssue(owner, name, params("id")).map { issue =>
+        if(isEditable(owner, name, issue.openedUserName)){
+          // update issue
+          updateIssue(owner, name, issue.issueId, form.title, form.content)
+          // extract references and create refer comment
+          createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
+
+          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
+
+  post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
+    handleComment(form.issueId, Some(form.content), repository)() map { case (issue, id) =>
+      redirect(s"/${repository.owner}/${repository.name}/${
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+    } getOrElse NotFound
+  })
+
+  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
+    handleComment(form.issueId, form.content, repository)() map { case (issue, id) =>
+      redirect(s"/${repository.owner}/${repository.name}/${
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
+    } getOrElse NotFound
+  })
+
+  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getComment(owner, name, params("id")).map { comment =>
+        if(isEditable(owner, name, comment.commentedUserName)){
+          updateComment(comment.commentId, form.content)
+          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
+
+  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getComment(owner, name, params("id")).map { comment =>
+        if(isEditable(owner, name, comment.commentedUserName)){
+          Ok(deleteComment(comment.commentId))
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
+
+  ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
+    getIssue(repository.owner, repository.name, params("id")) map { x =>
+      if(isEditable(x.userName, x.repositoryName, x.openedUserName)){
+        params.get("dataType") collect {
+          case t if t == "html" => issues.html.editissue(
+              x.title, x.content, x.issueId, x.userName, x.repositoryName)
+        } getOrElse {
+          contentType = formats("json")
+          org.json4s.jackson.Serialization.write(
+              Map("title"   -> x.title,
+                  "content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
+                      repository, false, true)
+              ))
+        }
+      } else Unauthorized
+    } getOrElse NotFound
+  })
+
+  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
+    getComment(repository.owner, repository.name, params("id")) map { x =>
+      if(isEditable(x.userName, x.repositoryName, x.commentedUserName)){
+        params.get("dataType") collect {
+          case t if t == "html" => issues.html.editcomment(
+              x.content, x.commentId, x.userName, x.repositoryName)
+        } getOrElse {
+          contentType = formats("json")
+          org.json4s.jackson.Serialization.write(
+              Map("content" -> view.Markdown.toHtml(x.content,
+                  repository, false, true)
+              ))
+        }
+      } else Unauthorized
+    } getOrElse NotFound
+  })
+
+  ajaxPost("/:owner/:repository/issues/:id/label/new")(collaboratorsOnly { repository =>
+    defining(params("id").toInt){ issueId =>
+      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
+  })
+
+  ajaxPost("/:owner/:repository/issues/:id/label/delete")(collaboratorsOnly { repository =>
+    defining(params("id").toInt){ issueId =>
+      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
+  })
+
+  ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
+    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
+    Ok("updated")
+  })
+
+  ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
+    milestoneId("milestoneId").map { milestoneId =>
+      getMilestonesWithIssueCount(repository.owner, repository.name)
+          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
+        issues.milestones.html.progress(openCount + closeCount, closeCount, false)
+      } getOrElse NotFound
+    } getOrElse Ok()
+  })
+
+  post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
+    defining(params.get("value")){ action =>
+      executeBatch(repository) {
+        handleComment(_, None, repository)( _ => action)
+      }
+    }
+  })
+
+  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
+    params("value").toIntOpt.map{ labelId =>
+      executeBatch(repository) { issueId =>
+        getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
+          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
+        }
+      }
+    } getOrElse NotFound
+  })
+
+  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
+    defining(assignedUserName("value")){ value =>
+      executeBatch(repository) {
+        updateAssignedUserName(repository.owner, repository.name, _, value)
+      }
+    }
+  })
+
+  post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
+    defining(milestoneId("value")){ value =>
+      executeBatch(repository) {
+        updateMilestoneId(repository.owner, repository.name, _, value)
+      }
+    }
+  })
+
+  get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
+    (Directory.getAttachedDir(repository.owner, repository.name) match {
+      case dir if(dir.exists && dir.isDirectory) =>
+        dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
+          contentType = FileUtil.getMimeType(file.getName)
+          file
+        }
+      case _ => None
+    }) getOrElse NotFound
+  })
+
+  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
+  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+
+  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")
+  }
+
+  private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = {
+    StringUtil.extractIssueId(message).foreach { issueId =>
+      if(getIssue(owner, repository, issueId).isDefined){
+        createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt,
+                      fromIssue.issueId + ":" + fromIssue.title, "refer")
+      }
+    }
+  }
+
+  /**
+   * @see [[https://github.com/takezoe/gitbucket/wiki/CommentAction]]
+   */
+  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))) = {
+
+    defining(repository.owner, repository.name){ case (owner, 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(if(issue.isPullRequest) recordClosePullRequestActivity _ else 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 {
+          (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
+          (owner, name, userName, issueId, _)
+        }
+        recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
+
+        // extract references and create refer comment
+        content.map { content =>
+          createReferComment(owner, name, issue, content)
+        }
+
+        // notifications
+        Notifier() match {
+          case f =>
+            content foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
+                  if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
+              }
+            }
+            action foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
+              }
+            }
+        }
+
+        issue -> commentId
+      }
+    }
+  }
+
+  private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
+    defining(repository.owner, repository.name){ case (owner, repoName) =>
+      val filterUser = Map(filter -> params.getOrElse("userName", ""))
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Issues(owner, repoName)
+
+      // retrieve search condition
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString) IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )
+
+      issues.html.list(
+          searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+          page,
+          (getCollaborators(owner, repoName) :+ owner).sorted,
+          getMilestones(owner, repoName),
+          getLabels(owner, repoName),
+          countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName),
+          countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName),
+          countIssue(condition, Map.empty, false, owner -> repoName),
+          context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)),
+          context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)),
+          countIssueGroupByLabels(owner, repoName, condition, filterUser),
+          condition,
+          filter,
+          repository,
+          hasWritePermission(owner, repoName, context.loginAccount))
+    }
+  }
+
+}
--- a/src/main/scala/app/LabelsController.scala
+++ b/src/main/scala/app/LabelsController.scala
@@ -3,6 +3,7 @@ package app
 import jp.sf.amateras.scalatra.forms._
 import service._
 import util.CollaboratorsAuthenticator
+import util.Implicits._
 import org.scalatra.i18n.Messages

 class LabelsController extends LabelsControllerBase
@@ -53,7 +54,7 @@ trait LabelsControllerBase extends ControllerBase {
   */
  private def labelName: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("^[^,]+$")){
+      if(value.contains(',')){
        Some(s"${name} contains invalid character.")
      } else if(value.startsWith("_") || value.startsWith("-")){
        Some(s"${name} starts with invalid character.")
@@ -62,4 +63,4 @@ trait LabelsControllerBase extends ControllerBase {
      }
  }

-}
+}
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -13,7 +13,6 @@ import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
 import service.IssuesService._
 import service.PullRequestService._
 import util.JGitUtil.DiffInfo
-import service.RepositoryService.RepositoryTreeNode
 import util.JGitUtil.CommitInfo
 import org.slf4j.LoggerFactory
 import org.eclipse.jgit.merge.MergeStrategy
@@ -100,7 +99,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        pulls.html.mergeguide(
          checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
          pullreq,
-          s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+          s"${context.baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
      }
    } getOrElse NotFound
  })
@@ -111,7 +110,7 @@ trait PullRequestsControllerBase extends ControllerBase {
      val userName   = context.loginAccount.get.userName
      if(repository.repository.defaultBranch != branchName){
        using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-          git.branchDelete().setBranchNames(branchName).call()
+          git.branchDelete().setForce(true).setBranchNames(branchName).call()
          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
        }
      }
@@ -124,7 +123,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    params("id").toIntOpt.flatMap { issueId =>
      val owner = repository.owner
      val name  = repository.name
-      LockUtil.lock(s"${owner}/${name}/merge"){
+      LockUtil.lock(s"${owner}/${name}"){
        getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
          using(Git.open(getRepositoryDir(owner, name))) { git =>
            // mark issue as merged and close.
@@ -157,7 +156,7 @@ trait PullRequestsControllerBase extends ControllerBase {
            val personIdent = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
            mergeCommit.setAuthor(personIdent)
            mergeCommit.setCommitter(personIdent)
-            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n\n" +
+            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" +
                                   form.message)

            // insertObject and got mergeCommit Object Id
@@ -177,14 +176,8 @@ trait PullRequestsControllerBase extends ControllerBase {
            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)

-            commits.flatten.foreach { commit =>
-              if(!existsCommitId(owner, name, commit.id)){
-                insertCommitId(owner, name, commit.id)
-              }
-            }
-
            // close issue by content of pull request
-            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            val defaultBranch = getRepository(owner, name, context.baseUrl).get.repository.defaultBranch
            if(pullreq.branch == defaultBranch){
              commits.flatten.foreach { commit =>
                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
@@ -207,7 +200,7 @@ trait PullRequestsControllerBase extends ControllerBase {

            // notifications
            Notifier().toNotify(repository, issueId, "merge"){
-              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
+              Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
            }

            redirect(s"/${owner}/${name}/pull/${issueId}")
@@ -220,7 +213,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
    (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
      case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName, baseUrl).map { originRepository =>
+        getRepository(originUserName, originRepositoryName, context.baseUrl).map { originRepository =>
          using(
            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
@@ -257,7 +250,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
-      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -266,7 +259,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2

-        val forkedId = getForkedCommitId(oldGit, newGit,
+        val forkedId = JGitUtil.getForkedCommitId(oldGit, newGit,
          originRepository.owner, originRepository.name, originBranch,
          forkedRepository.owner, forkedRepository.name, forkedBranch)

@@ -309,7 +302,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
-      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -362,7 +355,7 @@ trait PullRequestsControllerBase extends ControllerBase {

    // notifications
    Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-      Notifier.msgPullRequest(s"${baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
+      Notifier.msgPullRequest(s"${context.baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
    }

    redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
@@ -373,7 +366,7 @@ trait PullRequestsControllerBase extends ControllerBase {
   */
  private def checkConflict(userName: String, repositoryName: String, branch: String,
                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
-    LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
+    LockUtil.lock(s"${userName}/${repositoryName}"){
      using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
        val remoteRefName = s"refs/heads/${branch}"
        val tmpRefName = s"refs/merge-check/${userName}/${branch}"
@@ -409,7 +402,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  private def checkConflictInPullRequest(userName: String, repositoryName: String, branch: String,
                                         requestUserName: String, requestRepositoryName: String, requestBranch: String,
                                         issueId: Int): Boolean = {
-    LockUtil.lock(s"${userName}/${repositoryName}/merge") {
+    LockUtil.lock(s"${userName}/${repositoryName}") {
      using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
        // merge
        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
@@ -438,24 +431,8 @@ trait PullRequestsControllerBase extends ControllerBase {
      (defaultOwner, value)
    }

-  /**
-   * Extracts all repository names from [[service.RepositoryService.RepositoryTreeNode]] as flat list.
-   */
-  private def getRepositoryNames(node: RepositoryTreeNode): List[String] =
-    node.owner :: node.children.map { child => getRepositoryNames(child) }.flatten
-
-  /**
-   * Returns the identifier of the root commit (or latest merge commit) of the specified branch.
-   */
-  private def getForkedCommitId(oldGit: Git, newGit: Git, userName: String, repositoryName: String, branch: String,
-      requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
-    JGitUtil.getCommitLogs(newGit, requestBranch, true){ commit =>
-      existsCommitId(userName, repositoryName, commit.getName) && JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
-    }.head.id
-
  private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
-      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) = {
-
+      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) =
    using(
      Git.open(getRepositoryDir(userName, repositoryName)),
      Git.open(getRepositoryDir(requestUserName, requestRepositoryName))
@@ -466,14 +443,13 @@ trait PullRequestsControllerBase extends ControllerBase {
      val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
        new CommitInfo(revCommit)
      }.toList.splitWith { (commit1, commit2) =>
-        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+        view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
      }

      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)

      (commits, diffs)
    }
-  }

  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
    defining(repository.owner, repository.name){ case (owner, repoName) =>
@@ -489,7 +465,7 @@ trait PullRequestsControllerBase extends ControllerBase {

      pulls.html.list(
        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
-        getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
+        getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)),
        userName,
        page,
        countIssue(condition.copy(state = "open"  ), filterUser, true, owner -> repoName),
--- a/src/main/scala/app/RepositorySettingsController.scala
+++ b/src/main/scala/app/RepositorySettingsController.scala
@@ -1,266 +1,272 @@
-package app
-
-import service._
-import util.Directory._
-import util.{UsersAuthenticator, OwnerAuthenticator}
-import jp.sf.amateras.scalatra.forms._
-import org.apache.commons.io.FileUtils
-import org.scalatra.i18n.Messages
-import service.WebHookService.WebHookPayload
-import util.JGitUtil.CommitInfo
-import util.ControlUtil._
-import org.eclipse.jgit.api.Git
-
-class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService
-  with OwnerAuthenticator with UsersAuthenticator
-
-trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService
-    with OwnerAuthenticator with UsersAuthenticator =>
-
-  // for repository options
-  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
-  
-  val optionsForm = mapping(
-    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
-    "description"    -> trim(label("Description"    , optional(text()))),
-    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
-    "isPrivate"      -> trim(label("Repository Type", boolean()))
-  )(OptionsForm.apply)
-
-  // for collaborator addition
-  case class CollaboratorForm(userName: String)
-
-  val collaboratorForm = mapping(
-    "userName" -> trim(label("Username", text(required, collaborator)))
-  )(CollaboratorForm.apply)
-
-  // for web hook url addition
-  case class WebHookForm(url: String)
-
-  val webHookForm = mapping(
-    "url" -> trim(label("url", text(required, webHook)))
-  )(WebHookForm.apply)
-
-  // for transfer ownership
-  case class TransferOwnerShipForm(newOwner: String)
-
-  val transferForm = mapping(
-    "newOwner" -> trim(label("New owner", text(required, transferUser)))
-  )(TransferOwnerShipForm.apply)
-
-  /**
-   * Redirect to the Options page.
-   */
-  get("/:owner/:repository/settings")(ownerOnly { repository =>
-    redirect(s"/${repository.owner}/${repository.name}/settings/options")
-  })
-  
-  /**
-   * Display the Options page.
-   */
-  get("/:owner/:repository/settings/options")(ownerOnly {
-    settings.html.options(_, flash.get("info"))
-  })
-  
-  /**
-   * Save the repository options.
-   */
-  post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
-    saveRepositoryOptions(
-      repository.owner,
-      repository.name,
-      form.description,
-      form.defaultBranch,
-      repository.repository.parentUserName.map { _ =>
-        repository.repository.isPrivate
-      } getOrElse form.isPrivate
-    )
-    // Change repository name
-    if(repository.name != form.repositoryName){
-      // Update database
-      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
-      // Move git repository
-      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
-      }
-      // Move wiki repository
-      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
-      }
-    }
-    flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
-  })
-  
-  /**
-   * Display the Collaborators page.
-   */
-  get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
-    settings.html.collaborators(
-      getCollaborators(repository.owner, repository.name),
-      getAccountByUserName(repository.owner).get.isGroupAccount,
-      repository)
-  })
-
-  /**
-   * Add the collaborator.
-   */
-  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
-    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
-      addCollaborator(repository.owner, repository.name, form.userName)
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
-  })
-
-  /**
-   * Add the collaborator.
-   */
-  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
-    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
-      removeCollaborator(repository.owner, repository.name, params("name"))
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
-  })
-
-  /**
-   * Display the web hook page.
-   */
-  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
-    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
-  })
-
-  /**
-   * Add the web hook URL.
-   */
-  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
-    addWebHookURL(repository.owner, repository.name, form.url)
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Delete the web hook URL.
-   */
-  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
-    deleteWebHookURL(repository.owner, repository.name, params("url"))
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Send the test request to registered web hook URLs.
-   */
-  get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      import scala.collection.JavaConverters._
-      val commits = git.log
-        .add(git.getRepository.resolve(repository.repository.defaultBranch))
-        .setMaxCount(3)
-        .call.iterator.asScala.map(new CommitInfo(_))
-
-      getWebHookURLs(repository.owner, repository.name) match {
-        case webHookURLs if(webHookURLs.nonEmpty) =>
-          for(ownerAccount <- getAccountByUserName(repository.owner)){
-            callWebHook(repository.owner, repository.name, webHookURLs,
-              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
-          }
-        case _ =>
-      }
-
-      flash += "info" -> "Test payload deployed!"
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Display the danger zone.
-   */
-  get("/:owner/:repository/settings/danger")(ownerOnly {
-    settings.html.danger(_)
-  })
-
-  /**
-   * Transfer repository ownership.
-   */
-  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    // Change repository owner
-    if(repository.owner != form.newOwner){
-      // Update database
-      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
-      // Move git repository
-      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
-      }
-      // Move wiki repository
-      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
-      }
-    }
-    redirect(s"/${form.newOwner}/${repository.name}")
-  })
-
-  /**
-   * Delete the repository.
-   */
-  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    deleteRepository(repository.owner, repository.name)
-
-    FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
-    FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
-    FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
-
-    redirect(s"/${repository.owner}")
-  })
-
-  /**
-   * Provides duplication check for web hook url.
-   */
-  private def webHook: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
-  }
-
-  /**
-   * Provides Constraint to validate the collaborator name.
-   */
-  private def collaborator: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value) match {
-        case None => Some("User does not exist.")
-        case Some(x) if(x.isGroupAccount)
-                  => Some("User does not exist.")
-        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
-                  => Some("User can access this repository already.")
-        case _    => None
-      }
-  }
-
-  /**
-   * Duplicate check for the rename repository name.
-   */
-  private def renameRepositoryName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
-      params.get("repository").filter(_ != value).flatMap { _ =>
-        params.get("owner").flatMap { userName =>
-          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
-        }
-      }
-  }
-
-  /**
-   * Provides Constraint to validate the repository transfer user.
-   */
-  private def transferUser: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value) match {
-        case None    => Some("User does not exist.")
-        case Some(x) => if(x.userName == params("owner")){
-          Some("This is current repository owner.")
-        } else {
-          params.get("repository").flatMap { repositoryName =>
-            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
-          }
-        }
-      }
-  }
+package app
+
+import service._
+import util.Directory._
+import util.ControlUtil._
+import util.Implicits._
+import util.{LockUtil, UsersAuthenticator, OwnerAuthenticator}
+import util.JGitUtil.CommitInfo
+import jp.sf.amateras.scalatra.forms._
+import org.apache.commons.io.FileUtils
+import org.scalatra.i18n.Messages
+import service.WebHookService.WebHookPayload
+import util.JGitUtil.CommitInfo
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
+
+class RepositorySettingsController extends RepositorySettingsControllerBase
+  with RepositoryService with AccountService with WebHookService
+  with OwnerAuthenticator with UsersAuthenticator
+
+trait RepositorySettingsControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with WebHookService
+    with OwnerAuthenticator with UsersAuthenticator =>
+
+  // for repository options
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
+  
+  val optionsForm = mapping(
+    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
+  )(OptionsForm.apply)
+
+  // for collaborator addition
+  case class CollaboratorForm(userName: String)
+
+  val collaboratorForm = mapping(
+    "userName" -> trim(label("Username", text(required, collaborator)))
+  )(CollaboratorForm.apply)
+
+  // for web hook url addition
+  case class WebHookForm(url: String)
+
+  val webHookForm = mapping(
+    "url" -> trim(label("url", text(required, webHook)))
+  )(WebHookForm.apply)
+
+  // for transfer ownership
+  case class TransferOwnerShipForm(newOwner: String)
+
+  val transferForm = mapping(
+    "newOwner" -> trim(label("New owner", text(required, transferUser)))
+  )(TransferOwnerShipForm.apply)
+
+  /**
+   * Redirect to the Options page.
+   */
+  get("/:owner/:repository/settings")(ownerOnly { repository =>
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
+  })
+  
+  /**
+   * Display the Options page.
+   */
+  get("/:owner/:repository/settings/options")(ownerOnly {
+    settings.html.options(_, flash.get("info"))
+  })
+  
+  /**
+   * Save the repository options.
+   */
+  post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
+    saveRepositoryOptions(
+      repository.owner,
+      repository.name,
+      form.description,
+      if(repository.branchList.isEmpty) "master" else form.defaultBranch,
+      repository.repository.parentUserName.map { _ =>
+        repository.repository.isPrivate
+      } getOrElse form.isPrivate
+    )
+    // Change repository name
+    if(repository.name != form.repositoryName){
+      // Update database
+      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
+      }
+    }
+    flash += "info" -> "Repository settings has been updated."
+    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
+  })
+  
+  /**
+   * Display the Collaborators page.
+   */
+  get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
+    settings.html.collaborators(
+      getCollaborators(repository.owner, repository.name),
+      getAccountByUserName(repository.owner).get.isGroupAccount,
+      repository)
+  })
+
+  /**
+   * Add the collaborator.
+   */
+  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
+    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
+      addCollaborator(repository.owner, repository.name, form.userName)
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
+  })
+
+  /**
+   * Add the collaborator.
+   */
+  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
+    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
+      removeCollaborator(repository.owner, repository.name, params("name"))
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
+  })
+
+  /**
+   * Display the web hook page.
+   */
+  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
+    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
+  })
+
+  /**
+   * Add the web hook URL.
+   */
+  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
+    addWebHookURL(repository.owner, repository.name, form.url)
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Delete the web hook URL.
+   */
+  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
+    deleteWebHookURL(repository.owner, repository.name, params("url"))
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Send the test request to registered web hook URLs.
+   */
+  get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      import scala.collection.JavaConverters._
+      val commits = git.log
+        .add(git.getRepository.resolve(repository.repository.defaultBranch))
+        .setMaxCount(3)
+        .call.iterator.asScala.map(new CommitInfo(_))
+
+      getWebHookURLs(repository.owner, repository.name) match {
+        case webHookURLs if(webHookURLs.nonEmpty) =>
+          for(ownerAccount <- getAccountByUserName(repository.owner)){
+            callWebHook(repository.owner, repository.name, webHookURLs,
+              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
+          }
+        case _ =>
+      }
+
+      flash += "info" -> "Test payload deployed!"
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Display the danger zone.
+   */
+  get("/:owner/:repository/settings/danger")(ownerOnly {
+    settings.html.danger(_)
+  })
+
+  /**
+   * Transfer repository ownership.
+   */
+  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
+    // Change repository owner
+    if(repository.owner != form.newOwner){
+      LockUtil.lock(s"${repository.owner}/${repository.name}"){
+        // Update database
+        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+        // Move git repository
+        defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+          FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
+        }
+        // Move wiki repository
+        defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+          FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
+        }
+      }
+    }
+    redirect(s"/${form.newOwner}/${repository.name}")
+  })
+
+  /**
+   * Delete the repository.
+   */
+  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      deleteRepository(repository.owner, repository.name)
+
+      FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
+      FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
+      FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
+    }
+    redirect(s"/${repository.owner}")
+  })
+
+  /**
+   * Provides duplication check for web hook url.
+   */
+  private def webHook: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
+  }
+
+  /**
+   * Provides Constraint to validate the collaborator name.
+   */
+  private def collaborator: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None => Some("User does not exist.")
+        case Some(x) if(x.isGroupAccount)
+                  => Some("User does not exist.")
+        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
+                  => Some("User can access this repository already.")
+        case _    => None
+      }
+  }
+
+  /**
+   * Duplicate check for the rename repository name.
+   */
+  private def renameRepositoryName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
+      }
+  }
+
+  /**
+   * Provides Constraint to validate the repository transfer user.
+   */
+  private def transferUser: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None    => Some("User does not exist.")
+        case Some(x) => if(x.userName == params("owner")){
+          Some("This is current repository owner.")
+        } else {
+          params.get("repository").flatMap { repositoryName =>
+            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+          }
+        }
+      }
+  }
 }
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -1,27 +1,74 @@
 package app

+import _root_.util.JGitUtil.CommitInfo
 import util.Directory._
 import util.Implicits._
-import util.ControlUtil._
+import _root_.util.ControlUtil._
 import _root_.util._
 import service._
 import org.scalatra._
 import java.io.File
-import org.eclipse.jgit.api.Git
+
+import org.eclipse.jgit.api.{ArchiveCommand, Git}
+import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
-import java.util.zip.{ZipEntry, ZipOutputStream}
-import scala.Some
+import jp.sf.amateras.scalatra.forms._
+import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.revwalk.RevCommit
+import service.WebHookService.WebHookPayload
+
+class RepositoryViewerController extends RepositoryViewerControllerBase
+  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+  with ReferrerAuthenticator with CollaboratorsAuthenticator

-class RepositoryViewerController extends RepositoryViewerControllerBase 
-  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator

 /**
 * The repository viewer.
 */
-trait RepositoryViewerControllerBase extends ControllerBase { 
-  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+trait RepositoryViewerControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+
+  ArchiveCommand.registerFormat("zip", new ZipFormat)
+  ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
+
+  case class EditorForm(
+    branch: String,
+    path: String,
+    content: String,
+    message: Option[String],
+    charset: String,
+    lineSeparator: String,
+    newFileName: String,
+    oldFileName: Option[String]
+  )
+
+  case class DeleteForm(
+    branch: String,
+    path: String,
+    message: Option[String],
+    fileName: String
+  )
+
+  val editorForm = mapping(
+    "branch"        -> trim(label("Branch", text(required))),
+    "path"          -> trim(label("Path", text())),
+    "content"       -> trim(label("Content", text(required))),
+    "message"       -> trim(label("Message", optional(text()))),
+    "charset"       -> trim(label("Charset", text(required))),
+    "lineSeparator" -> trim(label("Line Separator", text(required))),
+    "newFileName"   -> trim(label("Filename", text(required))),
+    "oldFileName"   -> trim(label("Old filename", optional(text())))
+  )(EditorForm.apply)
+
+  val deleteForm = mapping(
+    "branch"   -> trim(label("Branch", text(required))),
+    "path"     -> trim(label("Path", text())),
+    "message"  -> trim(label("Message", optional(text()))),
+    "fileName" -> trim(label("Filename", text(required)))
+  )(DeleteForm.apply)

  /**
   * Returns converted HTML from Markdown for preview.
@@ -64,13 +111,77 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        case Right((logs, hasNext)) =>
          repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
            logs.splitWith{ (commit1, commit2) =>
-              view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+              view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
            }, page, hasNext)
        case Left(_) => NotFound
      }
    }
  })

+  get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    repo.html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
+      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")))
+  })
+
+  get("/:owner/:repository/edit/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  get("/:owner/:repository/remove/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), None,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
+      form.message.getOrElse(s"Create ${form.newFileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
+      if(form.oldFileName.exists(_ == form.newFileName)){
+        form.message.getOrElse(s"Update ${form.newFileName}")
+      } else {
+        form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
+      })
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/remove", deleteForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
+      form.message.getOrElse(s"Delete ${form.fileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
+  })
+
  /**
   * Displays the file content of the specified branch or commit.
   */
@@ -80,19 +191,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {

    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      @scala.annotation.tailrec
-      def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-        case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-        case true  => getPathObjectId(path, walk)
-        case false => None
-      }
-
-      using(new TreeWalk(git.getRepository)){ treeWalk =>
-        treeWalk.addTree(revCommit.getTree)
-        treeWalk.setRecursive(true)
-        getPathObjectId(path, treeWalk)
-      } map { objectId =>
+      getPathObjectId(git, path, revCommit).map { objectId =>
        if(raw){
          // Download
          defining(JGitUtil.getContentFromId(git, objectId, false).get){ bytes =>
@@ -100,25 +199,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            bytes
          }
        } else {
-          // Viewer
-          val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-          val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
-          val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
-
-          val content = if(viewer == "other"){
-            if(bytes.isDefined && FileUtil.isText(bytes.get)){
-              // text
-              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
-            } else {
-              // binary
-              JGitUtil.ContentInfo("binary", None)
-            }
-          } else {
-            // image or large
-            JGitUtil.ContentInfo(viewer, None)
-          }
-
-          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+          repo.html.blob(id, repository, path.split("/").toList, JGitUtil.getContentInfo(git, path, objectId),
+            new JGitUtil.CommitInfo(revCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount))
        }
      } getOrElse NotFound
    }
@@ -164,7 +246,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val userName   = context.loginAccount.get.userName
    if(repository.repository.defaultBranch != branchName){
      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        git.branchDelete().setBranchNames(branchName).call()
+        git.branchDelete().setForce(true).setBranchNames(branchName).call()
        recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
      }
    }
@@ -182,50 +264,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Download repository contents as an archive.
   */
  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
-    val name = multiParams("splat").head
-
-    if(name.endsWith(".zip")){
-      val revision = name.replaceFirst("\\.zip$", "")
-      val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
-      if(workDir.exists){
-        FileUtils.deleteDirectory(workDir)
-      }
-      workDir.mkdirs
-
-      val zipFile = new File(workDir, repository.name + "-" +
-        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
-
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
-        using(new TreeWalk(git.getRepository)){ walk =>
-          val reader   = walk.getObjectReader
-          val objectId = new MutableObjectId
-
-          using(new ZipOutputStream(new java.io.FileOutputStream(zipFile))){ out =>
-            walk.addTree(revCommit.getTree)
-            walk.setRecursive(true)
-
-            while(walk.next){
-              val name = walk.getPathString
-              val mode = walk.getFileMode(0)
-              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
-                walk.getObjectId(objectId, 0)
-                val entry = new ZipEntry(name)
-                val loader = reader.open(objectId)
-                entry.setSize(loader.getSize)
-                out.putNextEntry(entry)
-                loader.copyTo(out)
-              }
-            }
-          }
-        }
-      }
-
-      contentType = "application/octet-stream"
-      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
-      zipFile
-    } else {
-      BadRequest
+    multiParams("splat").head match {
+      case name if name.endsWith(".zip") =>
+        archiveRepository(name, ".zip", repository)
+      case name if name.endsWith(".tar.gz") =>
+        archiveRepository(name, ".tar.gz", repository)
+      case _ => BadRequest
    }
  })

@@ -234,29 +278,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      getRepository(
        repository.repository.originUserName.getOrElse(repository.owner),
        repository.repository.originRepositoryName.getOrElse(repository.name),
-        baseUrl),
+        context.baseUrl),
      getForkedRepositories(
        repository.repository.originUserName.getOrElse(repository.owner),
        repository.repository.originRepositoryName.getOrElse(repository.name)),
      repository)
  })
-  
+
  private def splitPath(repository: service.RepositoryService.RepositoryInfo, path: String): (String, String) = {
    val id = repository.branchList.collectFirst {
      case branch if(path == branch || path.startsWith(branch + "/")) => branch
    } orElse repository.tags.collectFirst {
      case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
-    } orElse Some(path.split("/")(0)) get
+    } getOrElse path.split("/")(0)

-    (id, path.substring(id.length).replaceFirst("^/", ""))
+    (id, path.substring(id.length).stripPrefix("/"))
  }


-  private val readmeFiles = Seq("readme.md", "readme.markdown")
+  private val readmeFiles = view.helpers.renderableSuffixes.map(suffix => s"readme${suffix}") ++ Seq("readme.txt", "readme")

  /**
   * Provides HTML of the file list.
-   * 
+   *
   * @param repository the repository information
   * @param revstr the branch name or commit id(optional)
   * @param path the directory path (optional)
@@ -264,31 +308,135 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   */
  private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
    if(repository.commitCount == 0){
-      repo.html.guide(repository)
+      repo.html.guide(repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } else {
      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
        // get specified commit
        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
-          defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
-          // get files
+          defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
+            // get files
            val files = JGitUtil.getFileList(git, revision, path)
+            val parentPath = if (path == ".") Nil else path.split("/").toList
            // process README.md or README.markdown
            val readme = files.find { file =>
              readmeFiles.contains(file.name.toLowerCase)
            }.map { file =>
-              file -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
+              val path = (file.name :: parentPath.reverse).reverse
+              path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
                Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
            }

            repo.html.files(revision, repository,
              if(path == ".") Nil else path.split("/").toList, // current path
              new JGitUtil.CommitInfo(revCommit), // latest commit
-              files, readme)
+              files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount))
          }
        } getOrElse NotFound
      }
    }
  }
-  
+
+  private def commitFile(repository: service.RepositoryService.RepositoryInfo,
+                         branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+                         content: String, charset: String, message: String) = {
+
+    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        val loginAccount = context.loginAccount.get
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${branch}"
+        val headTip  = git.getRepository.resolve(s"refs/heads/${branch}")
+
+        JGitUtil.processTree(git, headTip){ (path, tree) =>
+          if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+        }
+
+        newPath.foreach { newPath =>
+          builder.add(JGitUtil.createDirCacheEntry(newPath, FileMode.REGULAR_FILE,
+            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+        }
+        builder.finish()
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          loginAccount.fullName, loginAccount.mailAddress, message)
+
+        inserter.flush()
+        inserter.release()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        //refUpdate.setRefLogMessage("merged", true)
+        refUpdate.update()
+
+        // record activity
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
+          List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
+
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+
+        // call web hook
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        getWebHookURLs(repository.owner, repository.name) match {
+          case webHookURLs if(webHookURLs.nonEmpty) =>
+            for(ownerAccount <- getAccountByUserName(repository.owner)){
+              callWebHook(repository.owner, repository.name, webHookURLs,
+                WebHookPayload(git, loginAccount, headName, repository, List(commit), ownerAccount))
+            }
+          case _ =>
+        }
+      }
+    }
+  }
+
+  private def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
+    @scala.annotation.tailrec
+    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => _getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revCommit.getTree)
+      treeWalk.setRecursive(true)
+      _getPathObjectId(path, treeWalk)
+    }
+  }
+
+  private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): File = {
+    val revision = name.stripSuffix(suffix)
+    val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
+    if(workDir.exists) {
+      FileUtils.deleteDirectory(workDir)
+    }
+    workDir.mkdirs
+
+    val file = new File(workDir, repository.name + "-" +
+      (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+      using(new java.io.FileOutputStream(file))  { out =>
+        git.archive
+           .setFormat(suffix.tail)
+           .setTree(revCommit.getTree)
+           .setOutputStream(out)
+           .call()
+      }
+      contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${file.getName}")
+      file
+    }
+  }
 }
--- a/src/main/scala/app/SearchController.scala
+++ b/src/main/scala/app/SearchController.scala
@@ -2,6 +2,7 @@ package app

 import util._
 import ControlUtil._
+import Implicits._
 import service._
 import jp.sf.amateras.scalatra.forms._

--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -3,8 +3,14 @@ package app
 import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
+import util.Directory._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 import ssh.SshServer
+import org.apache.commons.io.FileUtils
+import java.io.FileInputStream
+import plugin.{Plugin, PluginSystem}
+import org.scalatra.Ok

 class SystemSettingsController extends SystemSettingsControllerBase
  with AccountService with AdminAuthenticator
@@ -36,8 +42,9 @@ trait SystemSettingsControllerBase extends ControllerBase {
        "bindPassword"             -> trim(label("Bind Password", optional(text()))),
        "baseDN"                   -> trim(label("Base DN", text(required))),
        "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+        "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))),
        "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
-        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
+        "mailAttribute"            -> trim(label("Mail address attribute", optional(text()))),
        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
        "keystore"                 -> trim(label("Keystore", optional(text())))
    )(Ldap.apply))
@@ -47,6 +54,11 @@ trait SystemSettingsControllerBase extends ControllerBase {
    } else Nil
  }

+  private val pluginForm = mapping(
+    "pluginId" -> list(trim(label("", text())))
+  )(PluginForm.apply)
+
+  case class PluginForm(pluginIds: List[String])

  get("/admin/system")(adminOnly {
    admin.html.system(flash.get("info"))
@@ -55,6 +67,10 @@ trait SystemSettingsControllerBase extends ControllerBase {
  post("/admin/system", form)(adminOnly { form =>
    saveSystemSettings(form)

+    if(form.ssh && SshServer.isActive && context.settings.sshPort != form.sshPort){
+      SshServer.stop()
+    }
+
    if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
      SshServer.start(request.getServletContext,
        form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
@@ -67,4 +83,103 @@ trait SystemSettingsControllerBase extends ControllerBase {
    redirect("/admin/system")
  })

+  get("/admin/plugins")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
+    val updatablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "updatable")
+    admin.plugins.html.installed(installedPlugins, updatablePlugins)
+  })
+
+  post("/admin/plugins/_update", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
+    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+  post("/admin/plugins/_delete", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+  get("/admin/plugins/available")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
+    val availablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "available")
+    admin.plugins.html.available(availablePlugins)
+  })
+
+  post("/admin/plugins/_install", pluginForm)(adminOnly { form =>
+    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+//  get("/admin/plugins/console")(adminOnly {
+//    admin.plugins.html.console()
+//  })
+//
+//  post("/admin/plugins/console")(adminOnly {
+//    val script = request.getParameter("script")
+//    val result = plugin.JavaScriptPlugin.evaluateJavaScript(script)
+//    Ok(result)
+//  })
+
+  // TODO Move these methods to PluginSystem or Service?
+  private def deletePlugins(pluginIds: List[String]): Unit = {
+    pluginIds.foreach { pluginId =>
+      plugin.PluginSystem.uninstall(pluginId)
+      val dir = new java.io.File(PluginHome, pluginId)
+      if(dir.exists && dir.isDirectory){
+        FileUtils.deleteQuietly(dir)
+        PluginSystem.uninstall(pluginId)
+      }
+    }
+  }
+
+  private def installPlugins(pluginIds: List[String]): Unit = {
+    val dir = getPluginCacheDir()
+    val installedPlugins = plugin.PluginSystem.plugins
+    getAvailablePlugins(installedPlugins).filter(x => pluginIds.contains(x.id)).foreach { plugin =>
+      val pluginDir = new java.io.File(PluginHome, plugin.id)
+      if(!pluginDir.exists){
+        FileUtils.copyDirectory(new java.io.File(dir, plugin.repository + "/" + plugin.id), pluginDir)
+      }
+      PluginSystem.installPlugin(plugin.id)
+    }
+  }
+
+  private def getAvailablePlugins(installedPlugins: List[Plugin]): List[SystemSettingsControllerBase.AvailablePlugin] = {
+    val repositoryRoot = getPluginCacheDir()
+
+    if(repositoryRoot.exists && repositoryRoot.isDirectory){
+      PluginSystem.repositories.flatMap { repo =>
+        val repoDir = new java.io.File(repositoryRoot, repo.id)
+        if(repoDir.exists && repoDir.isDirectory){
+          repoDir.listFiles.filter(d => d.isDirectory && !d.getName.startsWith(".")).map { plugin =>
+            val propertyFile = new java.io.File(plugin, "plugin.properties")
+            val properties = new java.util.Properties()
+            if(propertyFile.exists && propertyFile.isFile){
+              using(new FileInputStream(propertyFile)){ in =>
+                properties.load(in)
+              }
+            }
+            SystemSettingsControllerBase.AvailablePlugin(
+              repository  = repo.id,
+              id          = properties.getProperty("id"),
+              version     = properties.getProperty("version"),
+              author      = properties.getProperty("author"),
+              url         = properties.getProperty("url"),
+              description = properties.getProperty("description"),
+              status      = installedPlugins.find(_.id == properties.getProperty("id")) match {
+                case Some(x) if(PluginSystem.isUpdatable(x.version, properties.getProperty("version")))=> "updatable"
+                case Some(x) => "installed"
+                case None    => "available"
+              })
+          }
+        } else Nil
+      }
+    } else Nil
+  }
+}
+
+object SystemSettingsControllerBase {
+  case class AvailablePlugin(repository: String, id: String, version: String,
+                             author: String, url: String, description: String, status: String)
 }
--- a/src/main/scala/app/UserManagementController.scala
+++ b/src/main/scala/app/UserManagementController.scala
@@ -4,10 +4,11 @@ import service._
 import util.AdminAuthenticator
 import util.StringUtil._
 import util.ControlUtil._
+import util.Directory._
+import util.Implicits._
 import jp.sf.amateras.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.apache.commons.io.FileUtils
-import util.Directory._

 class UserManagementController extends UserManagementControllerBase
  with AccountService with RepositoryService with AdminAuthenticator
@@ -181,11 +182,6 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
    }
  })

-  // TODO Move to other generic controller?
-  post("/admin/users/_usercheck"){
-    getAccountByUserName(params("userName")).isDefined
-  }
-
  private def members: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
      if(value.split(",").exists {
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -4,10 +4,10 @@ import service._
 import util._
 import util.Directory._
 import util.ControlUtil._
+import util.Implicits._
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
-import scala.Some
 import java.util.ResourceBundle

 class WikiController extends WikiControllerBase 
@@ -36,7 +36,8 @@ 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))
+      wiki.html.page("Home", page, getWikiPageList(repository.owner, repository.name),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
  })
  
@@ -44,7 +45,8 @@ trait WikiControllerBase extends ControllerBase {
    val pageName = StringUtil.urlDecode(params("page"))

    getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
+      wiki.html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
  })
  
--- a/src/main/scala/model/Account.scala
+++ b/src/main/scala/model/Account.scala
@@ -1,34 +1,39 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object Accounts extends Table[Account]("ACCOUNT") {
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def fullName = column[String]("FULL_NAME")
-  def mailAddress = column[String]("MAIL_ADDRESS")
-  def password = column[String]("PASSWORD")
-  def isAdmin = column[Boolean]("ADMINISTRATOR")
-  def url = column[String]("URL")
-  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 image = column[String]("IMAGE")
-  def groupAccount = column[Boolean]("GROUP_ACCOUNT")
-  def removed = column[Boolean]("REMOVED")
-  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount ~ removed <> (Account, Account.unapply _)
-}
-
-case class Account(
-    userName: String,
-    fullName: String,
-    mailAddress: String,
-    password: String,
-    isAdmin: Boolean,
-    url: Option[String],
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date,
-    lastLoginDate: Option[java.util.Date],
-    image: Option[String],
-    isGroupAccount: Boolean,
-    isRemoved: Boolean
-)
+package model
+
+trait AccountComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val Accounts = TableQuery[Accounts]
+
+  class Accounts(tag: Tag) extends Table[Account](tag, "ACCOUNT") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val fullName = column[String]("FULL_NAME")
+    val mailAddress = column[String]("MAIL_ADDRESS")
+    val password = column[String]("PASSWORD")
+    val isAdmin = column[Boolean]("ADMINISTRATOR")
+    val url = column[String]("URL")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
+    val image = column[String]("IMAGE")
+    val groupAccount = column[Boolean]("GROUP_ACCOUNT")
+    val removed = column[Boolean]("REMOVED")
+    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
+  }
+}
+
+case class Account(
+  userName: String,
+  fullName: String,
+  mailAddress: String,
+  password: String,
+  isAdmin: Boolean,
+  url: Option[String],
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date,
+  lastLoginDate: Option[java.util.Date],
+  image: Option[String],
+  isGroupAccount: Boolean,
+  isRemoved: Boolean
+)
--- a/src/main/scala/model/Activity.scala
+++ b/src/main/scala/model/Activity.scala
@@ -1,31 +1,29 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait ActivityComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._

-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
-}
+  lazy val Activities = TableQuery[Activities]

-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)
+  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
+    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
+    val activityUserName = column[String]("ACTIVITY_USER_NAME")
+    val activityType = column[String]("ACTIVITY_TYPE")
+    val message = column[String]("MESSAGE")
+    val additionalInfo = column[String]("ADDITIONAL_INFO")
+    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
+    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+  }
 }

 case class Activity(
-  activityId: Int,
  userName: String,
  repositoryName: String,
  activityUserName: String,
  activityType: String,
  message: String,
  additionalInfo: Option[String],
-  activityDate: java.util.Date
+  activityDate: java.util.Date,
+  activityId: Int = 0
 )
--- a/src/main/scala/model/BasicTemplate.scala
+++ b/src/main/scala/model/BasicTemplate.scala
@@ -1,44 +1,47 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-protected[model] trait BasicTemplate { self: Table[_] =>
-  def userName = column[String]("USER_NAME")
-  def repositoryName = column[String]("REPOSITORY_NAME")
-
-  def byRepository(owner: String, repository: String) =
-    (userName is owner.bind) && (repositoryName is repository.bind)
-
-  def byRepository(userName: Column[String], repositoryName: Column[String]) =
-    (this.userName is userName) && (this.repositoryName is repositoryName)
-}
-
-protected[model] trait IssueTemplate extends BasicTemplate { self: Table[_] =>
-  def issueId = column[Int]("ISSUE_ID")
-
-  def byIssue(owner: String, repository: String, issueId: Int) =
-    byRepository(owner, repository) && (this.issueId is issueId.bind)
-
-  def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.issueId is issueId)
-}
-
-protected[model] trait LabelTemplate extends BasicTemplate { self: Table[_] =>
-  def labelId = column[Int]("LABEL_ID")
-
-  def byLabel(owner: String, repository: String, labelId: Int) =
-    byRepository(owner, repository) && (this.labelId is labelId.bind)
-
-  def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.labelId is labelId)
-}
-
-protected[model] trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
-  def milestoneId = column[Int]("MILESTONE_ID")
-
-  def byMilestone(owner: String, repository: String, milestoneId: Int) =
-    byRepository(owner, repository) && (this.milestoneId is milestoneId.bind)
-
-  def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.milestoneId is milestoneId)
-}
+package model
+
+protected[model] trait TemplateComponent { self: Profile =>
+  import profile.simple._
+
+  trait BasicTemplate { self: Table[_] =>
+    val userName = column[String]("USER_NAME")
+    val repositoryName = column[String]("REPOSITORY_NAME")
+
+    def byRepository(owner: String, repository: String) =
+      (userName === owner.bind) && (repositoryName === repository.bind)
+
+    def byRepository(userName: Column[String], repositoryName: Column[String]) =
+      (this.userName === userName) && (this.repositoryName === repositoryName)
+  }
+
+  trait IssueTemplate extends BasicTemplate { self: Table[_] =>
+    val issueId = column[Int]("ISSUE_ID")
+
+    def byIssue(owner: String, repository: String, issueId: Int) =
+      byRepository(owner, repository) && (this.issueId === issueId.bind)
+
+    def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.issueId === issueId)
+  }
+
+  trait LabelTemplate extends BasicTemplate { self: Table[_] =>
+    val labelId = column[Int]("LABEL_ID")
+
+    def byLabel(owner: String, repository: String, labelId: Int) =
+      byRepository(owner, repository) && (this.labelId === labelId.bind)
+
+    def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.labelId === labelId)
+  }
+
+  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
+    val milestoneId = column[Int]("MILESTONE_ID")
+
+    def byMilestone(owner: String, repository: String, milestoneId: Int) =
+      byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
+
+    def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
+  }
+
+}
--- a/src/main/scala/model/Collaborator.scala
+++ b/src/main/scala/model/Collaborator.scala
@@ -1,13 +1,17 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait CollaboratorComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._

-object Collaborators extends Table[Collaborator]("COLLABORATOR") with BasicTemplate {
-  def collaboratorName = column[String]("COLLABORATOR_NAME")
-  def * = userName ~ repositoryName ~ collaboratorName <> (Collaborator, Collaborator.unapply _)
+  lazy val Collaborators = TableQuery[Collaborators]

-  def byPrimaryKey(owner: String, repository: String, collaborator: String) =
-    byRepository(owner, repository) && (collaboratorName is collaborator.bind)
+  class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
+    val collaboratorName = column[String]("COLLABORATOR_NAME")
+    def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, collaborator: String) =
+      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
+  }
 }

 case class Collaborator(
--- a/src/main/scala/model/GroupMembers.scala
+++ b/src/main/scala/model/GroupMembers.scala
@@ -1,16 +1,20 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait GroupMemberComponent { self: Profile =>
+  import profile.simple._

-object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") {
-  def groupName = column[String]("GROUP_NAME", O PrimaryKey)
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def isManager = column[Boolean]("MANAGER")
-  def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _)
+  lazy val GroupMembers = TableQuery[GroupMembers]
+
+  class GroupMembers(tag: Tag) extends Table[GroupMember](tag, "GROUP_MEMBER") {
+    val groupName = column[String]("GROUP_NAME", O PrimaryKey)
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val isManager = column[Boolean]("MANAGER")
+    def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
+  }
 }

 case class GroupMember(
  groupName: String,
  userName: String,
  isManager: Boolean
-)
+)
--- a/src/main/scala/model/Issue.scala
+++ b/src/main/scala/model/Issue.scala
@@ -1,41 +1,49 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object IssueId extends Table[(String, String, Int)]("ISSUE_ID") with IssueTemplate {
-  def * = userName ~ repositoryName ~ issueId
-  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
-}
-
-object IssueOutline extends Table[(String, String, Int, Int)]("ISSUE_OUTLINE_VIEW") with IssueTemplate {
-  def commentCount = column[Int]("COMMENT_COUNT")
-  def * = userName ~ repositoryName ~ issueId ~ commentCount
-}
-
-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")
-  def content = column[String]("CONTENT")
-  def closed = column[Boolean]("CLOSED")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def pullRequest = column[Boolean]("PULL_REQUEST")
-  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate ~ pullRequest <> (Issue, Issue.unapply _)
-
-  def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
-}
-
-case class Issue(
-    userName: String,
-    repositoryName: String,
-    issueId: Int,
-    openedUserName: String,
-    milestoneId: Option[Int],
-    assignedUserName: Option[String],
-    title: String,
-    content: Option[String],
-    closed: Boolean,
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date,
-    isPullRequest: Boolean)
+package model
+
+trait IssueComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val IssueId = TableQuery[IssueId]
+  lazy val IssueOutline = TableQuery[IssueOutline]
+  lazy val Issues = TableQuery[Issues]
+
+  class IssueId(tag: Tag) extends Table[(String, String, Int)](tag, "ISSUE_ID") with IssueTemplate {
+    def * = (userName, repositoryName, issueId)
+    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  }
+
+  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+    val commentCount = column[Int]("COMMENT_COUNT")
+    def * = (userName, repositoryName, issueId, commentCount)
+  }
+
+  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
+    val openedUserName = column[String]("OPENED_USER_NAME")
+    val assignedUserName = column[String]("ASSIGNED_USER_NAME")
+    val title = column[String]("TITLE")
+    val content = column[String]("CONTENT")
+    val closed = column[Boolean]("CLOSED")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val pullRequest = column[Boolean]("PULL_REQUEST")
+    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
+  }
+}
+
+case class Issue(
+  userName: String,
+  repositoryName: String,
+  issueId: Int,
+  openedUserName: String,
+  milestoneId: Option[Int],
+  assignedUserName: Option[String],
+  title: String,
+  content: Option[String],
+  closed: Boolean,
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date,
+  isPullRequest: Boolean
+)
--- a/src/main/scala/model/IssueComment.scala
+++ b/src/main/scala/model/IssueComment.scala
@@ -1,28 +1,34 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-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 autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
-  def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
-}
-
-case class IssueComment(
-    userName: String,
-    repositoryName: String,
-    issueId: Int,
-    commentId: Int,
-    action: String,
-    commentedUserName: String,
-    content: String,
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date
-)
+package model
+
+trait IssueCommentComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
+    def autoInc = this returning this.map(_.commentId)
+  }
+
+  class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
+    val commentId = column[Int]("COMMENT_ID", O AutoInc)
+    val action = column[String]("ACTION")
+    val commentedUserName = column[String]("COMMENTED_USER_NAME")
+    val content = column[String]("CONTENT")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
+
+    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
+  }
+}
+
+case class IssueComment(
+  userName: String,
+  repositoryName: String,
+  issueId: Int,
+  commentId: Int = 0,
+  action: String,
+  commentedUserName: String,
+  content: String,
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date
+)
--- a/src/main/scala/model/IssueLabels.scala
+++ b/src/main/scala/model/IssueLabels.scala
@@ -1,15 +1,20 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait IssueLabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._

-object IssueLabels extends Table[IssueLabel]("ISSUE_LABEL") with IssueTemplate with LabelTemplate {
-  def * = userName ~ repositoryName ~ issueId ~ labelId <> (IssueLabel, IssueLabel.unapply _)
-  def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
-    byIssue(owner, repository, issueId) && (this.labelId is labelId.bind)
+  lazy val IssueLabels = TableQuery[IssueLabels]
+
+  class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
+    def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
+    def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
+      byIssue(owner, repository, issueId) && (this.labelId === labelId.bind)
+  }
 }

 case class IssueLabel(
  userName: String,
  repositoryName: String,
  issueId: Int,
-  labelId: Int)
+  labelId: Int
+)
--- a/src/main/scala/model/Labels.scala
+++ b/src/main/scala/model/Labels.scala
@@ -1,21 +1,25 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait LabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._

-object Labels extends Table[Label]("LABEL") with LabelTemplate {
-  def labelName = column[String]("LABEL_NAME")
-  def color = column[String]("COLOR")
-  def * = userName ~ repositoryName ~ labelId ~ labelName ~ color <> (Label, Label.unapply _)
+  lazy val Labels = TableQuery[Labels]

-  def ins = userName ~ repositoryName ~ labelName ~ color
-  def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
+  class Labels(tag: Tag) extends Table[Label](tag, "LABEL") with LabelTemplate {
+    override val labelId = column[Int]("LABEL_ID", O AutoInc)
+    val labelName = column[String]("LABEL_NAME")
+    val color = column[String]("COLOR")
+    def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
+  }
 }

 case class Label(
  userName: String,
  repositoryName: String,
-  labelId: Int,
+  labelId: Int = 0,
  labelName: String,
  color: String){

@@ -30,5 +34,4 @@ case class Label(
      "FFFFFF"
    }
  }
-
-}
+}
--- a/src/main/scala/model/Milestone.scala
+++ b/src/main/scala/model/Milestone.scala
@@ -1,24 +1,30 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait MilestoneComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._

-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")
-  def closedDate = column[java.util.Date]("CLOSED_DATE")
-  def * = userName ~ repositoryName ~ milestoneId ~ title ~ description.? ~ dueDate.? ~ closedDate.? <> (Milestone, Milestone.unapply _)
+  lazy val Milestones = TableQuery[Milestones]

-  def ins = userName ~ repositoryName ~ title ~ description.? ~ dueDate.? ~ closedDate.?
-  def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
+  class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
+    override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val description = column[String]("DESCRIPTION")
+    val dueDate = column[java.util.Date]("DUE_DATE")
+    val closedDate = column[java.util.Date]("CLOSED_DATE")
+    def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
+  }
 }

 case class Milestone(
  userName: String,
  repositoryName: String,
-  milestoneId: Int,
+  milestoneId: Int = 0,
  title: String,
  description: Option[String],
  dueDate: Option[java.util.Date],
-  closedDate: Option[java.util.Date])
+  closedDate: Option[java.util.Date]
+)
--- a/src/main/scala/model/Profile.scala
+++ b/src/main/scala/model/Profile.scala
@@ -0,0 +1,41 @@
+package model
+
+trait Profile {
+  val profile: slick.driver.JdbcProfile
+  import profile.simple._
+
+  // java.util.Date Mapped Column Types
+  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
+      d => new java.sql.Timestamp(d.getTime),
+      t => new java.util.Date(t.getTime)
+  )
+
+  implicit class RichColumn(c1: Column[Boolean]){
+    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
+  }
+
+}
+
+object Profile extends {
+  val profile = slick.driver.H2Driver
+
+} with AccountComponent
+  with ActivityComponent
+  with CollaboratorComponent
+  with GroupMemberComponent
+  with IssueComponent
+  with IssueCommentComponent
+  with IssueLabelComponent
+  with LabelComponent
+  with MilestoneComponent
+  with PullRequestComponent
+  with RepositoryComponent
+  with SshKeyComponent
+  with WebHookComponent with Profile {
+
+  /**
+   * Returns system date.
+   */
+  def currentDate = new java.util.Date()
+
+}
--- a/src/main/scala/model/PullRequest.scala
+++ b/src/main/scala/model/PullRequest.scala
@@ -1,18 +1,22 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait PullRequestComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._

-object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplate {
-  def branch = column[String]("BRANCH")
-  def requestUserName = column[String]("REQUEST_USER_NAME")
-  def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
-  def requestBranch = column[String]("REQUEST_BRANCH")
-  def commitIdFrom = column[String]("COMMIT_ID_FROM")
-  def commitIdTo = column[String]("COMMIT_ID_TO")
-  def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch ~ commitIdFrom ~ commitIdTo <> (PullRequest, PullRequest.unapply _)
+  lazy val PullRequests = TableQuery[PullRequests]

-  def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+  class PullRequests(tag: Tag) extends Table[PullRequest](tag, "PULL_REQUEST") with IssueTemplate {
+    val branch = column[String]("BRANCH")
+    val requestUserName = column[String]("REQUEST_USER_NAME")
+    val requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
+    val requestBranch = column[String]("REQUEST_BRANCH")
+    val commitIdFrom = column[String]("COMMIT_ID_FROM")
+    val commitIdTo = column[String]("COMMIT_ID_TO")
+    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
+
+    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+  }
 }

 case class PullRequest(
@@ -25,4 +29,4 @@ case class PullRequest(
  requestBranch: String,
  commitIdFrom: String,
  commitIdTo: String
-)
+)
--- a/src/main/scala/model/Repository.scala
+++ b/src/main/scala/model/Repository.scala
@@ -1,21 +1,26 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait RepositoryComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._

-object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
-  def isPrivate = column[Boolean]("PRIVATE")
-  def description = column[String]("DESCRIPTION")
-  def defaultBranch = column[String]("DEFAULT_BRANCH")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
-  def originUserName = column[String]("ORIGIN_USER_NAME")
-  def originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-  def parentUserName = column[String]("PARENT_USER_NAME")
-  def parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
-  def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate ~ originUserName.? ~ originRepositoryName.? ~ parentUserName.? ~ parentRepositoryName.? <> (Repository, Repository.unapply _)
+  lazy val Repositories = TableQuery[Repositories]

-  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
+    val isPrivate = column[Boolean]("PRIVATE")
+    val description = column[String]("DESCRIPTION")
+    val defaultBranch = column[String]("DEFAULT_BRANCH")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
+    val originUserName = column[String]("ORIGIN_USER_NAME")
+    val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
+    val parentUserName = column[String]("PARENT_USER_NAME")
+    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
+    def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Repository.tupled, Repository.unapply)
+
+    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  }
 }

 case class Repository(
--- a/src/main/scala/model/SshKey.scala
+++ b/src/main/scala/model/SshKey.scala
@@ -1,22 +1,24 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait SshKeyComponent { self: Profile =>
+  import profile.simple._

-object SshKeys extends Table[SshKey]("SSH_KEY") {
-  def userName = column[String]("USER_NAME")
-  def sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
-  def title = column[String]("TITLE")
-  def publicKey = column[String]("PUBLIC_KEY")
+  lazy val SshKeys = TableQuery[SshKeys]

-  def ins = userName ~ title ~ publicKey returning sshKeyId
-  def * = userName ~ sshKeyId ~ title ~ publicKey <> (SshKey, SshKey.unapply _)
+  class SshKeys(tag: Tag) extends Table[SshKey](tag, "SSH_KEY") {
+    val userName = column[String]("USER_NAME")
+    val sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val publicKey = column[String]("PUBLIC_KEY")
+    def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)

-  def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
+  }
 }

 case class SshKey(
  userName: String,
-  sshKeyId: Int,
+  sshKeyId: Int = 0,
  title: String,
  publicKey: String
 )
--- a/src/main/scala/model/WebHook.scala
+++ b/src/main/scala/model/WebHook.scala
@@ -1,12 +1,16 @@
 package model

-import scala.slick.driver.H2Driver.simple._
+trait WebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._

-object WebHooks extends Table[WebHook]("WEB_HOOK") with BasicTemplate {
-  def url = column[String]("URL")
-  def * = userName ~ repositoryName ~ url <> (WebHook, WebHook.unapply _)
+  lazy val WebHooks = TableQuery[WebHooks]

-  def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+  class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+  }
 }

 case class WebHook(
--- a/src/main/scala/model/package.scala
+++ b/src/main/scala/model/package.scala
@@ -1,20 +1,3 @@
-package object model {
-  import scala.slick.driver.BasicDriver.Implicit._
-  import scala.slick.lifted.{Column, MappedTypeMapper}
-
-  // java.util.Date TypeMapper
-  implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
-      d => new java.sql.Timestamp(d.getTime),
-      t => new java.util.Date(t.getTime)
-  )
-
-  implicit class RichColumn(c1: Column[Boolean]){
-    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
-  }
-
-  /**
-   * Returns system date.
-   */
-  def currentDate = new java.util.Date()
-
-}
+package object model {
+  type Session = slick.jdbc.JdbcBackend#Session
+}
--- a/src/main/scala/plugin/JavaScriptPlugin.scala
+++ b/src/main/scala/plugin/JavaScriptPlugin.scala
@@ -0,0 +1,117 @@
+package plugin
+
+import org.mozilla.javascript.{Context => JsContext}
+import org.mozilla.javascript.{Function => JsFunction}
+import scala.collection.mutable.ListBuffer
+import plugin.PluginSystem._
+import util.ControlUtil._
+import plugin.PluginSystem.GlobalMenu
+import plugin.PluginSystem.RepositoryAction
+import plugin.PluginSystem.Action
+import plugin.PluginSystem.RepositoryMenu
+
+class JavaScriptPlugin(val id: String, val version: String,
+                       val author: String, val url: String, val description: String) extends Plugin {
+
+  private val repositoryMenuList   = ListBuffer[RepositoryMenu]()
+  private val globalMenuList       = ListBuffer[GlobalMenu]()
+  private val repositoryActionList = ListBuffer[RepositoryAction]()
+  private val globalActionList     = ListBuffer[Action]()
+
+  def repositoryMenus   : List[RepositoryMenu]   = repositoryMenuList.toList
+  def globalMenus       : List[GlobalMenu]       = globalMenuList.toList
+  def repositoryActions : List[RepositoryAction] = repositoryActionList.toList
+  def globalActions     : List[Action]           = globalActionList.toList
+
+  def addRepositoryMenu(label: String, name: String, url: String, icon: String, condition: JsFunction): Unit = {
+    repositoryMenuList += RepositoryMenu(label, name, url, icon, (context) => {
+      val context = JsContext.enter()
+      try {
+        condition.call(context, condition, condition, Array(context)).asInstanceOf[Boolean]
+      } finally {
+        JsContext.exit()
+      }
+    })
+  }
+
+  def addGlobalMenu(label: String, url: String, icon: String, condition: JsFunction): Unit = {
+    globalMenuList += GlobalMenu(label, url, icon, (context) => {
+      val context = JsContext.enter()
+      try {
+        condition.call(context, condition, condition, Array(context)).asInstanceOf[Boolean]
+      } finally {
+        JsContext.exit()
+      }
+    })
+  }
+
+  def addGlobalAction(path: String, function: JsFunction): Unit = {
+    globalActionList += Action(path, (request, response) => {
+      val context = JsContext.enter()
+      try {
+        function.call(context, function, function, Array(request, response))
+      } finally {
+        JsContext.exit()
+      }
+    })
+  }
+
+  def addRepositoryAction(path: String, function: JsFunction): Unit = {
+    repositoryActionList += RepositoryAction(path, (request, response, repository) => {
+      val context = JsContext.enter()
+      try {
+        function.call(context, function, function, Array(request, response, repository))
+      } finally {
+        JsContext.exit()
+      }
+    })
+  }
+
+  object db {
+    // TODO Use JavaScript Map instead of java.util.Map
+    def select(sql: String): Array[java.util.Map[String, String]] = {
+      defining(PluginConnectionHolder.threadLocal.get){ conn =>
+        using(conn.prepareStatement(sql)){ stmt =>
+          using(stmt.executeQuery()){ rs =>
+            val list = new java.util.ArrayList[java.util.Map[String, String]]()
+            while(rs.next){
+              defining(rs.getMetaData){ meta =>
+                val map = new java.util.HashMap[String, String]()
+                Range(1, meta.getColumnCount).map { i =>
+                  val name = meta.getColumnName(i)
+                  map.put(name, rs.getString(name))
+                }
+                list.add(map)
+              }
+            }
+            list.toArray(new Array[java.util.Map[String, String]](list.size))
+          }
+        }
+      }
+    }
+  }
+
+}
+
+object JavaScriptPlugin {
+
+  def define(id: String, version: String, author: String, url: String, description: String)
+    = new JavaScriptPlugin(id, version, author, url, description)
+
+  def evaluateJavaScript(script: String, vars: Map[String, Any] = Map.empty): Any = {
+    val context = JsContext.enter()
+    try {
+      val scope = context.initStandardObjects()
+      scope.put("PluginSystem", scope, PluginSystem)
+      scope.put("JavaScriptPlugin", scope, this)
+      vars.foreach { case (key, value) =>
+        scope.put(key, scope, value)
+      }
+      val result = context.evaluateString(scope, script, "<cmd>", 1, null)
+      result
+    } finally {
+      JsContext.exit
+    }
+  }
+
+}
--- a/src/main/scala/plugin/Plugin.scala
+++ b/src/main/scala/plugin/Plugin.scala
@@ -0,0 +1,21 @@
+package plugin
+
+import plugin.PluginSystem._
+import java.sql.Connection
+
+trait Plugin {
+  val id: String
+  val version: String
+  val author: String
+  val url: String
+  val description: String
+
+  def repositoryMenus   : List[RepositoryMenu]
+  def globalMenus       : List[GlobalMenu]
+  def repositoryActions : List[RepositoryAction]
+  def globalActions     : List[Action]
+}
+
+object PluginConnectionHolder {
+  val threadLocal = new ThreadLocal[Connection]
+}
--- a/src/main/scala/plugin/PluginSystem.scala
+++ b/src/main/scala/plugin/PluginSystem.scala
@@ -0,0 +1,125 @@
+package plugin
+
+import app.Context
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import org.slf4j.LoggerFactory
+import java.util.concurrent.atomic.AtomicBoolean
+import util.Directory._
+import util.ControlUtil._
+import org.apache.commons.io.FileUtils
+import util.JGitUtil
+import org.eclipse.jgit.api.Git
+import service.RepositoryService.RepositoryInfo
+
+/**
+ * Provides extension points to plug-ins.
+ */
+object PluginSystem {
+
+  private val logger = LoggerFactory.getLogger(PluginSystem.getClass)
+
+  private val initialized = new AtomicBoolean(false)
+  private val pluginsMap = scala.collection.mutable.Map[String, Plugin]()
+  private val repositoriesList = scala.collection.mutable.ListBuffer[PluginRepository]()
+
+  def install(plugin: Plugin): Unit = {
+    pluginsMap.put(plugin.id, plugin)
+  }
+
+  def plugins: List[Plugin] = pluginsMap.values.toList
+
+  def uninstall(id: String): Unit = {
+    pluginsMap.remove(id)
+  }
+
+  def repositories: List[PluginRepository] = repositoriesList.toList
+
+  /**
+   * Initializes the plugin system. Load scripts from GITBUCKET_HOME/plugins.
+   */
+  def init(): Unit = {
+    if(initialized.compareAndSet(false, true)){
+      // Load installed plugins
+      val pluginDir = new java.io.File(PluginHome)
+      if(pluginDir.exists && pluginDir.isDirectory){
+        pluginDir.listFiles.filter(f => f.isDirectory && !f.getName.startsWith(".")).foreach { dir =>
+          installPlugin(dir.getName)
+        }
+      }
+      // Add default plugin repositories
+      repositoriesList += PluginRepository("central", "https://github.com/takezoe/gitbucket_plugins.git")
+    }
+  }
+
+  // TODO Method name seems to not so good.
+  def installPlugin(id: String): Unit = {
+    val pluginDir = new java.io.File(PluginHome)
+    val javaScriptFile = new java.io.File(pluginDir, id + "/plugin.js")
+
+    if(javaScriptFile.exists && javaScriptFile.isFile){
+      val properties = new java.util.Properties()
+      using(new java.io.FileInputStream(new java.io.File(pluginDir, id + "/plugin.properties"))){ in =>
+        properties.load(in)
+      }
+
+      val script = FileUtils.readFileToString(javaScriptFile, "UTF-8")
+      try {
+        JavaScriptPlugin.evaluateJavaScript(script, Map(
+          "id"          -> properties.getProperty("id"),
+          "version"     -> properties.getProperty("version"),
+          "author"      -> properties.getProperty("author"),
+          "url"         -> properties.getProperty("url"),
+          "description" -> properties.getProperty("description")
+        ))
+      } catch {
+        case e: Exception => logger.warn(s"Error in plugin loading for ${javaScriptFile.getAbsolutePath}", e)
+      }
+    }
+  }
+
+  def repositoryMenus   : List[RepositoryMenu]   = pluginsMap.values.flatMap(_.repositoryMenus).toList
+  def globalMenus       : List[GlobalMenu]       = pluginsMap.values.flatMap(_.globalMenus).toList
+  def repositoryActions : List[RepositoryAction] = pluginsMap.values.flatMap(_.repositoryActions).toList
+  def globalActions     : List[Action]           = pluginsMap.values.flatMap(_.globalActions).toList
+
+  // Case classes to hold plug-ins information internally in GitBucket
+  case class PluginRepository(id: String, url: String)
+  case class GlobalMenu(label: String, url: String, icon: String, condition: Context => Boolean)
+  case class RepositoryMenu(label: String, name: String, url: String, icon: String, condition: Context => Boolean)
+  case class Action(path: String, function: (HttpServletRequest, HttpServletResponse) => Any)
+  case class RepositoryAction(path: String, function: (HttpServletRequest, HttpServletResponse, RepositoryInfo) => Any)
+
+  /**
+   * Checks whether the plugin is updatable.
+   */
+  def isUpdatable(oldVersion: String, newVersion: String): Boolean = {
+    if(oldVersion == newVersion){
+      false
+    } else {
+      val dim1 = oldVersion.split("\\.").map(_.toInt)
+      val dim2 = newVersion.split("\\.").map(_.toInt)
+      dim1.zip(dim2).foreach { case (a, b) =>
+        if(a < b){
+          return true
+        } else if(a > b){
+          return false
+        }
+      }
+      return false
+    }
+  }
+
+  // TODO This is a test
+//  addGlobalMenu("Google", "http://www.google.co.jp/", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAEvwAABL8BkeKJvAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIgSURBVEiJtdZNiI1hFAfw36ORhSFFPgYLszOKJAsWRLGzks1gYyFZKFs7C7K2Y2XDRiwmq9kIJWQjJR9Tk48xRtTIRwjH4p473nm99yLNqdNTz/mf//+555x7ektEmEmbNaPs6OkUKKX0YBmWp6/IE8bwIs8xjEfEt0aiiJBl6sEuXMRLfEf8pX/PnIvJ0TPFWxE4+w+Ef/Kzbd5qDx5l8H8tkku7LG17gH7sxWatevdhEUoXsjda5RnDTZzH6jagtMe0lHIa23AJw3iOiSRZlmJ9mfcyfTzFl2AldmI3rkbEkbrAYKrX7S1eVRyWVnxhQ87eiLjQ+o2/mtyve+PuYy3W4+EfsP2/TVGKTHRI+Iz9Fdx8XOmAnZjGWRMYqoF/4ESW4hpOYk1iZ2WsLjDUTeBYBfgeuyux2XiNT5hXud+DD5W8Y90EtifoSfultfjx7MVtrKzcr8No5m7vJtCLx1hQJ8/4IZzClpyoy5ibsYUYQW81Z9o2jYgPeKr15+poEXE9+1XF9WIkOaasaV2P4k4pZUdDbEm+VEQcjIgtEfGxlLIVd/Gs6TX1MhzQquU3HK1t23f4IsuS94fxNXMO/MbXIDBg+tidw5yMbcCmylSdqWEH/kagYLKWeAt9Fcxi3KhhJuXq6SqQBMO15NDalvswmLWux4cbuToIbMS9BpJOfg8bm7imtmmTlVJWaa3hpnU9nufziBjtyDHTny0/AaA7Qnb4AM4aAAAAAElFTkSuQmCC")
+//    { context => context.loginAccount.isDefined }
+//
+//  addRepositoryMenu("Board", "board", "/board", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAEvwAABL8BkeKJvAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIgSURBVEiJtdZNiI1hFAfw36ORhSFFPgYLszOKJAsWRLGzks1gYyFZKFs7C7K2Y2XDRiwmq9kIJWQjJR9Tk48xRtTIRwjH4p473nm99yLNqdNTz/mf//+555x7ektEmEmbNaPs6OkUKKX0YBmWp6/IE8bwIs8xjEfEt0aiiJBl6sEuXMRLfEf8pX/PnIvJ0TPFWxE4+w+Ef/Kzbd5qDx5l8H8tkku7LG17gH7sxWatevdhEUoXsjda5RnDTZzH6jagtMe0lHIa23AJw3iOiSRZlmJ9mfcyfTzFl2AldmI3rkbEkbrAYKrX7S1eVRyWVnxhQ87eiLjQ+o2/mtyve+PuYy3W4+EfsP2/TVGKTHRI+Iz9Fdx8XOmAnZjGWRMYqoF/4ESW4hpOYk1iZ2WsLjDUTeBYBfgeuyux2XiNT5hXud+DD5W8Y90EtifoSfultfjx7MVtrKzcr8No5m7vJtCLx1hQJ8/4IZzClpyoy5ibsYUYQW81Z9o2jYgPeKr15+poEXE9+1XF9WIkOaasaV2P4k4pZUdDbEm+VEQcjIgtEfGxlLIVd/Gs6TX1MhzQquU3HK1t23f4IsuS94fxNXMO/MbXIDBg+tidw5yMbcCmylSdqWEH/kagYLKWeAt9Fcxi3KhhJuXq6SqQBMO15NDalvswmLWux4cbuToIbMS9BpJOfg8bm7imtmmTlVJWaa3hpnU9nufziBjtyDHTny0/AaA7Qnb4AM4aAAAAAElFTkSuQmCC")
+//    { context => true}
+//
+//  addGlobalAction("/hello"){ (request, response) =>
+//    "Hello World!"
+//  }
+
+}
+
+
--- a/src/main/scala/plugin/PluginUpdateJob.scala
+++ b/src/main/scala/plugin/PluginUpdateJob.scala
@@ -0,0 +1,66 @@
+package plugin
+
+import util.Directory._
+import org.eclipse.jgit.api.Git
+import org.slf4j.LoggerFactory
+import org.quartz.{Scheduler, JobExecutionContext, Job}
+import org.quartz.JobBuilder._
+import org.quartz.TriggerBuilder._
+import org.quartz.SimpleScheduleBuilder._
+
+class PluginUpdateJob extends Job {
+
+  private val logger = LoggerFactory.getLogger(classOf[PluginUpdateJob])
+  private var failedCount = 0
+
+  /**
+   * Clone or pull all plugin repositories
+   *
+   * TODO Support plugin repository access through the proxy server
+   */
+  override def execute(context: JobExecutionContext): Unit = {
+    try {
+      if(failedCount > 3){
+        logger.error("Skip plugin information updating because failed count is over limit")
+      } else {
+        logger.info("Start plugin information updating")
+        PluginSystem.repositories.foreach { repository =>
+          logger.info(s"Updating ${repository.id}: ${repository.url}...")
+          val dir = getPluginCacheDir()
+          val repo = new java.io.File(dir, repository.id)
+          if(repo.exists){
+            // pull if the repository is already cloned
+            Git.open(repo).pull().call()
+          } else {
+            // clone if the repository is not exist
+            Git.cloneRepository().setURI(repository.url).setDirectory(repo).call()
+          }
+        }
+        logger.info("End plugin information updating")
+      }
+    } catch {
+      case e: Exception => {
+        failedCount = failedCount + 1
+        logger.error("Failed to update plugin information", e)
+      }
+    }
+  }
+}
+
+object PluginUpdateJob {
+
+  def schedule(scheduler: Scheduler): Unit = {
+    val job = newJob(classOf[PluginUpdateJob])
+      .withIdentity("pluginUpdateJob")
+      .build()
+
+    val trigger = newTrigger()
+      .withIdentity("pluginUpdateTrigger")
+      .startNow()
+      .withSchedule(simpleSchedule().withIntervalInHours(24).repeatForever())
+      .build()
+
+    scheduler.scheduleJob(job, trigger)
+  }
+
+}
--- a/src/main/scala/plugin/ScalaPlugin.scala
+++ b/src/main/scala/plugin/ScalaPlugin.scala
@@ -0,0 +1,39 @@
+package plugin
+
+import app.Context
+import scala.collection.mutable.ListBuffer
+import plugin.PluginSystem._
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import service.RepositoryService.RepositoryInfo
+
+// TODO This is a sample implementation for Scala based plug-ins.
+class ScalaPlugin(val id: String, val version: String,
+                  val author: String, val url: String, val description: String) extends Plugin {
+
+  private val repositoryMenuList   = ListBuffer[RepositoryMenu]()
+  private val globalMenuList       = ListBuffer[GlobalMenu]()
+  private val repositoryActionList = ListBuffer[RepositoryAction]()
+  private val globalActionList     = ListBuffer[Action]()
+
+  def repositoryMenus   : List[RepositoryMenu]   = repositoryMenuList.toList
+  def globalMenus       : List[GlobalMenu]       = globalMenuList.toList
+  def repositoryActions : List[RepositoryAction] = repositoryActionList.toList
+  def globalActions     : List[Action]           = globalActionList.toList
+
+  def addRepositoryMenu(label: String, name: String, url: String, icon: String)(condition: (Context) => Boolean): Unit = {
+    repositoryMenuList += RepositoryMenu(label, name, url, icon, condition)
+  }
+
+  def addGlobalMenu(label: String, url: String, icon: String)(condition: (Context) => Boolean): Unit = {
+    globalMenuList += GlobalMenu(label, url, icon, condition)
+  }
+
+  def addGlobalAction(path: String)(function: (HttpServletRequest, HttpServletResponse) => Any): Unit = {
+    globalActionList += Action(path, function)
+  }
+
+  def addRepositoryAction(path: String)(function: (HttpServletRequest, HttpServletResponse, RepositoryInfo) => Any): Unit = {
+    repositoryActionList += RepositoryAction(path, function)
+  }
+
+}
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -1,13 +1,12 @@
 package service

-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.{Account, GroupMember}
+// TODO [Slick 2.0]NOT import directly?
+import model.Profile.dateColumnType
 import service.SystemSettingsService.SystemSettings
 import util.StringUtil._
-import model.GroupMember
-import scala.Some
-import model.Account
 import util.LDAPUtil
 import org.slf4j.LoggerFactory

@@ -15,7 +14,7 @@ trait AccountService {

  private val logger = LoggerFactory.getLogger(classOf[AccountService])

-  def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
+  def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] =
    if(settings.ldapAuthentication){
      ldapAuthentication(settings, userName, password)
    } else {
@@ -25,7 +24,7 @@ trait AccountService {
  /**
   * Authenticate by internal database.
   */
-  private def defaultAuthentication(userName: String, password: String) = {
+  private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = {
    getAccountByUserName(userName).collect {
      case account if(!account.isGroupAccount && account.password == sha1(password)) => Some(account)
    } getOrElse None
@@ -34,19 +33,39 @@ trait AccountService {
  /**
   * Authenticate by LDAP.
   */
-  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String) = {
+  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String)
+                                (implicit s: Session): Option[Account] = {
    LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
      case Right(ldapUserInfo) => {
        // Create or update account by LDAP information
-        getAccountByUserName(userName, true) match {
-          case Some(x) if(!x.isRemoved) => updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+        getAccountByUserName(ldapUserInfo.userName, true) match {
+          case Some(x) if(!x.isRemoved) => {
+            if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
+              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
+            } else {
+              updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+            }
+            getAccountByUserName(ldapUserInfo.userName)
+          }
          case Some(x) if(x.isRemoved)  => {
-            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+            logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
            defaultAuthentication(userName, password)
          }
-          case None => createAccount(userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+          case None => getAccountByMailAddress(ldapUserInfo.mailAddress, true) match {
+            case Some(x) if(!x.isRemoved) => {
+              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
+              getAccountByUserName(ldapUserInfo.userName)
+            }
+            case Some(x) if(x.isRemoved)  => {
+              logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
+              defaultAuthentication(userName, password)
+            }
+            case None => {
+              createAccount(ldapUserInfo.userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+              getAccountByUserName(ldapUserInfo.userName)
+            }
+          }
        }
-        getAccountByUserName(userName)
      }
      case Left(errorMessage) => {
        logger.info(s"LDAP Authentication Failed: ${errorMessage}")
@@ -55,20 +74,21 @@ trait AccountService {
    }
  }

-  def getAccountByUserName(userName: String, includeRemoved: Boolean = false): Option[Account] =
-    Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+  def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
+    Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption

-  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] =
-    Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
+    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption

-  def getAllUsers(includeRemoved: Boolean = true): List[Account] =
+  def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
    if(includeRemoved){
-      Query(Accounts) sortBy(_.userName) list
+      Accounts sortBy(_.userName) list
    } else {
-      Query(Accounts) filter (_.removed is false.bind) sortBy(_.userName) list
+      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
    }
-    
-  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
+
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
+                   (implicit s: Session): Unit =
    Accounts insert Account(
      userName       = userName,
      password       = password,
@@ -83,14 +103,14 @@ trait AccountService {
      isGroupAccount = false,
      isRemoved      = false)

-  def updateAccount(account: Account): Unit = 
+  def updateAccount(account: Account)(implicit s: Session): Unit =
    Accounts
-      .filter { a => a.userName is account.userName.bind }
-      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? ~ a.removed }
+      .filter { a =>  a.userName === account.userName.bind }
+      .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
      .update (
-        account.password, 
-        account.fullName, 
-        account.mailAddress, 
+        account.password,
+        account.fullName,
+        account.mailAddress,
        account.isAdmin,
        account.url,
        account.registeredDate,
@@ -98,13 +118,13 @@ trait AccountService {
        account.lastLoginDate,
        account.isRemoved)

-  def updateAvatarImage(userName: String, image: Option[String]): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
+  def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
+    Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)

-  def updateLastLoginDate(userName: String): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.lastLoginDate).update(currentDate)
+  def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
+    Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)

-  def createGroup(groupName: String, url: Option[String]): Unit =
+  def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
    Accounts insert Account(
      userName       = groupName,
      password       = "",
@@ -119,35 +139,35 @@ trait AccountService {
      isGroupAccount = true,
      isRemoved      = false)

-  def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit =
-    Accounts.filter(_.userName is groupName.bind).map(t => t.url.? ~ t.removed).update(url, removed)
+  def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
+    Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)

-  def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = {
-    Query(GroupMembers).filter(_.groupName is groupName.bind).delete
+  def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
+    GroupMembers.filter(_.groupName === groupName.bind).delete
    members.foreach { case (userName, isManager) =>
      GroupMembers insert GroupMember (groupName, userName, isManager)
    }
  }

-  def getGroupMembers(groupName: String): List[GroupMember] =
-    Query(GroupMembers)
-      .filter(_.groupName is groupName.bind)
+  def getGroupMembers(groupName: String)(implicit s: Session): List[GroupMember] =
+    GroupMembers
+      .filter(_.groupName === groupName.bind)
      .sortBy(_.userName)
      .list

-  def getGroupsByUserName(userName: String): List[String] =
-    Query(GroupMembers)
-      .filter(_.userName is userName.bind)
+  def getGroupsByUserName(userName: String)(implicit s: Session): List[String] =
+    GroupMembers
+      .filter(_.userName === userName.bind)
      .sortBy(_.groupName)
      .map(_.groupName)
      .list

-  def removeUserRelatedData(userName: String): Unit = {
-    Query(GroupMembers).filter(_.userName is userName.bind).delete
-    Query(Collaborators).filter(_.collaboratorName is userName.bind).delete
-    Query(Repositories).filter(_.userName is userName.bind).delete
+  def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
+    GroupMembers.filter(_.userName === userName.bind).delete
+    Collaborators.filter(_.collaboratorName === userName.bind).delete
+    Repositories.filter(_.userName === userName.bind).delete
  }

 }

-object AccountService extends AccountService
+object AccountService extends AccountService
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -1,19 +1,19 @@
 package service

-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.Activity

 trait ActivityService {

-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
    Activities
      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
      .filter { case (t1, t2) =>
        if(isPublic){
-          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+          (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
        } else {
-          (t1.activityUserName is activityUserName.bind)
+          (t1.activityUserName === activityUserName.bind)
        }
      }
      .sortBy { case (t1, t2) => t1.activityId desc }
@@ -21,151 +21,159 @@ trait ActivityService {
      .take(30)
      .list

-  def getRecentActivities(): List[Activity] =
+  def getRecentActivities()(implicit s: Session): List[Activity] =
    Activities
      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => t2.isPrivate is false.bind }
+      .filter { case (t1, t2) =>  t2.isPrivate === 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,
+  def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
+    Activities
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
+
+  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)
+                                    (implicit s: Session): Unit =
+    Activities insert Activity(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,
+  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(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,
+  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                              (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "close_issue",
      s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
      Some(title),
      currentDate)

-  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                                    (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "close_issue",
      s"[user:${activityUserName}] closed pull request [pullreq:${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,
+  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(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,
+  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "comment_issue",
      s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
      Some(cut(comment, 200)),
      currentDate)

-  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
+                                      (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "comment_issue",
      s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
      Some(cut(comment, 200)),
      currentDate)

-  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String)
+                                  (implicit s: Session): Unit =
+    Activities insert Activity(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, commitId: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+
+  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "edit_wiki",
      s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
      Some(pageName + ":" + commitId),
      currentDate)
-  
-  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String, 
-      branchName: String, commits: List[util.JGitUtil.CommitInfo]) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+
+  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String,
+      branchName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(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,
+      tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "create_tag",
      s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
      None,
      currentDate)

  def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
-                              tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+                              tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "delete_tag",
      s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
      None,
      currentDate)

-  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "create_branch",
      s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
      None,
      currentDate)

-  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "delete_branch",
      s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
      None,
      currentDate)

-  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String)(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "fork",
      s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${activityUserName}/${repositoryName}]",
      None,
      currentDate)

-  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "open_pullreq",
      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
      Some(title),
      currentDate)

-  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String)
+                         (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
      "merge_pullreq",
      s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
      Some(message),
      currentDate)

-  def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
-    CommitLog insert (userName, repositoryName, commitId)
-  }
-
-  def insertAllCommitIds(userName: String, repositoryName: String, commitIds: List[String]) =
-    CommitLog insertAll (commitIds.map(commitId => (userName, repositoryName, commitId)): _*)
-
-  def getAllCommitIds(userName: String, repositoryName: String): List[String] =
-    Query(CommitLog).filter(_.byRepository(userName, repositoryName)).map(_.commitId).list
-
-  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 = 
+  private def cut(value: String, length: Int): String =
    if(value.length > length) value.substring(0, length) + "..." else value
 }
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -1,380 +1,386 @@
-package service
-
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
-
-import model._
-import util.Implicits._
-import util.StringUtil._
-
-trait IssuesService {
-  import IssuesService._
-
-  def getIssue(owner: String, repository: String, issueId: String) =
-    if (issueId forall (_.isDigit))
-      Query(Issues) filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
-    else None
-
-  def getComments(owner: String, repository: String, issueId: Int) =
-    Query(IssueComments) filter (_.byIssue(owner, repository, issueId)) list
-
-  def getComment(owner: String, repository: String, commentId: String) =
-    if (commentId forall (_.isDigit))
-      Query(IssueComments) filter { t =>
-        t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
-      } firstOption
-    else None
-
-  def getIssueLabels(owner: String, repository: String, issueId: Int) =
-    IssueLabels
-      .innerJoin(Labels).on { (t1, t2) =>
-        t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
-      }
-      .filter ( _._1.byIssue(owner, repository, issueId) )
-      .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.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
-   * @param repos Tuple of the repository owner and the repository name
-   * @return the count of the search result
-   */
-  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-                 repos: (String, String)*): Int =
-    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
-  /**
-   * Returns the Map which contains issue count for each labels.
-   *
-   * @param owner the repository owner
-   * @param repository the repository name
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @return the Map which contains issue count for each labels (key is label name, value is issue count)
-   */
-  def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
-                              filterUser: Map[String, String]): Map[String, Int] = {
-
-    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false)
-      .innerJoin(IssueLabels).on { (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .innerJoin(Labels).on { case ((t1, t2), t3) =>
-        t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
-      }
-      .groupBy { case ((t1, t2), t3) =>
-        t3.labelName
-      }
-      .map { case (labelName, t) =>
-        labelName ~ t.length
-      }
-      .toMap
-  }
-  /**
-   * Returns list which contains issue count for each repository.
-   * If the issue does not exist, its repository is not included in the result.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
-   * @param repos Tuple of the repository owner and the repository name
-   * @return list which contains issue count for each repository
-   */
-  def countIssueGroupByRepository(
-      condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-      repos: (String, String)*): List[(String, String, Int)] = {
-    searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest)
-      .groupBy { t =>
-        t.userName ~ t.repositoryName
-      }
-      .map { case (repo, t) =>
-        repo ~ t.length
-      }
-      .sortBy(_._3 desc)
-      .list
-  }
-
-  /**
-   * Returns the search result against  issues.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name)
-   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
-   * @param offset the offset for pagination
-   * @param limit the limit for pagination
-   * @param repos Tuple of the repository owner and the repository name
-   * @return the search result (list of tuples which contain issue, labels and comment count)
-   */
-  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-                  offset: Int, limit: Int, repos: (String, String)*): List[(Issue, List[Label], Int)] = {
-
-    // get issues and comment count and labels
-    searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
-        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-        .sortBy { case (t1, t2) =>
-          (condition.sort match {
-            case "created"  => t1.registeredDate
-            case "comments" => t2.commentCount
-            case "updated"  => t1.updatedDate
-          }) match {
-            case sort => condition.direction match {
-              case "asc"  => sort asc
-              case "desc" => sort desc
-            }
-          }
-        }
-        .drop(offset).take(limit)
-        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-        .map { case (((t1, t2), t3), t4) =>
-          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
-        }
-        .list
-        .splitWith { (c1, c2) =>
-          c1._1.userName == c2._1.userName &&
-          c1._1.repositoryName == c2._1.repositoryName &&
-          c1._1.issueId == c2._1.issueId
-        }
-        .map { issues => issues.head match {
-          case (issue, commentCount, _,_,_) =>
-            (issue,
-             issues.flatMap { t => t._3.map (
-                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
-             )} toList,
-             commentCount)
-        }} toList
-  }
-
-  /**
-   * Assembles query for conditional issue searching.
-   */
-  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition,
-                               filterUser: Map[String, String], onlyPullRequest: Boolean) =
-    Query(Issues) filter { t1 =>
-      condition.repo
-          .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
-          .getOrElse (repos)
-          .map { case (owner, repository) => t1.byRepository(owner, repository) }
-          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
-      (t1.closed           is (condition.state == "closed").bind) &&
-      (t1.milestoneId      is condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
-      (t1.milestoneId      isNull, condition.milestoneId == Some(None)) &&
-      (t1.assignedUserName is filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
-      (t1.openedUserName   is filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
-      (t1.openedUserName   isNot filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
-      (t1.pullRequest      is true.bind, onlyPullRequest) &&
-      (IssueLabels filter { t2 =>
-        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
-        (t2.labelId in
-          (Labels filter { t3 =>
-            (t3.byRepository(t1.userName, t1.repositoryName)) &&
-            (t3.labelName inSetBind condition.labels)
-          } map(_.labelId)))
-      } exists, condition.labels.nonEmpty)
-    }
-
-  def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
-                  assignedUserName: Option[String], milestoneId: Option[Int], isPullRequest: Boolean = false) =
-    // next id number
-    sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
-        .firstOption.filter { id =>
-      Issues insert Issue(
-          owner,
-          repository,
-          id,
-          loginUser,
-          milestoneId,
-          assignedUserName,
-          title,
-          content,
-          false,
-          currentDate,
-          currentDate,
-          isPullRequest)
-
-      // increment issue id
-      IssueId
-        .filter (_.byPrimaryKey(owner, repository))
-        .map (_.issueId)
-        .update (id) > 0
-    } get
-
-  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
-    IssueLabels insert (IssueLabel(owner, repository, issueId, labelId))
-
-  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
-    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
-
-  def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: String) =
-    IssueComments.autoInc insert (
-        owner,
-        repository,
-        issueId,
-        action,
-        loginUser,
-        content,
-        currentDate,
-        currentDate)
-
-  def updateIssue(owner: String, repository: String, issueId: Int,
-      title: String, content: Option[String]) =
-    Issues
-      .filter (_.byPrimaryKey(owner, repository, issueId))
-      .map { t =>
-        t.title ~ t.content.? ~ t.updatedDate
-      }
-      .update (title, content, currentDate)
-
-  def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String]) =
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
-
-  def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int]) =
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
-
-  def updateComment(commentId: Int, content: String) =
-    IssueComments
-      .filter (_.byPrimaryKey(commentId))
-      .map { t =>
-        t.content ~ t.updatedDate
-      }
-      .update (content, currentDate)
-
-  def deleteComment(commentId: Int) =
-    IssueComments filter (_.byPrimaryKey(commentId)) delete
-
-  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean) =
-    Issues
-      .filter (_.byPrimaryKey(owner, repository, issueId))
-      .map { t =>
-        t.closed ~ t.updatedDate
-      }
-      .update (closed, currentDate)
-
-  /**
-   * Search issues by keyword.
-   *
-   * @param owner the repository owner
-   * @param repository the repository name
-   * @param query the keywords separated by whitespace.
-   * @return issues with comment count and matched content of issue or comment
-   */
-  def searchIssuesByKeyword(owner: String, repository: String, query: String): List[(Issue, Int, String)] = {
-    import scala.slick.driver.H2Driver.likeEncode
-    val keywords = splitWords(query.toLowerCase)
-
-    // Search Issue
-    val issues = Issues
-      .innerJoin(IssueOutline).on { case (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .filter { case (t1, t2) =>
-        keywords.map { keyword =>
-          (t1.title.toLowerCase   like (s"%${likeEncode(keyword)}%", '^')) ||
-          (t1.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
-        } .reduceLeft(_ && _)
-      }
-      .map { case (t1, t2) =>
-        (t1, 0, t1.content.?, t2.commentCount)
-      }
-
-    // Search IssueComment
-    val comments = IssueComments
-      .innerJoin(Issues).on { case (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
-        t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
-      }
-      .filter { case ((t1, t2), t3) =>
-        keywords.map { query =>
-          t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
-        }.reduceLeft(_ && _)
-      }
-      .map { case ((t1, t2), t3) =>
-        (t2, t1.commentId, t1.content.?, t3.commentCount)
-      }
-
-    issues.union(comments).sortBy { case (issue, commentId, _, _) =>
-      issue.issueId ~ commentId
-    }.list.splitWith { case ((issue1, _, _, _), (issue2, _, _, _)) =>
-      issue1.issueId == issue2.issueId
-    }.map { _.head match {
-        case (issue, _, content, commentCount) => (issue, commentCount, content.getOrElse(""))
-      }
-    }.toList
-  }
-
-  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
-    extractCloseId(message).foreach { issueId =>
-      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
-        createComment(owner, repository, userName, issue.issueId, "Close", "close")
-        updateClosed(owner, repository, issue.issueId, true)
-      }
-    }
-  }
-}
-
-object IssuesService {
-  import javax.servlet.http.HttpServletRequest
-
-  val IssueLimit = 30
-
-  case class IssueSearchCondition(
-      labels: Set[String] = Set.empty,
-      milestoneId: Option[Option[Int]] = None,
-      repo: Option[String] = None,
-      state: String = "open",
-      sort: String = "created",
-      direction: String = "desc"){
-
-    def toURL: String =
-      "?" + List(
-        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
-        milestoneId.map { id => "milestone=" + (id match {
-          case Some(x) => x.toString
-          case None    => "none"
-        })},
-        repo.map("for="   + urlEncode(_)),
-        Some("state="     + urlEncode(state)),
-        Some("sort="      + urlEncode(sort)),
-        Some("direction=" + urlEncode(direction))).flatten.mkString("&")
-
-  }
-
-  object IssueSearchCondition {
-
-    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)
-    }
-
-    def apply(request: HttpServletRequest): IssueSearchCondition =
-      IssueSearchCondition(
-        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
-        param(request, "milestone").map{
-          case "none" => None
-          case x      => x.toIntOpt
-        },
-        param(request, "for"),
-        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
-        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
-        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"))
-
-    def page(request: HttpServletRequest) = try {
-      val i = param(request, "page").getOrElse("1").toInt
-      if(i <= 0) 1 else i
-    } catch {
-      case e: NumberFormatException => 1
-    }
-  }
-
-}
+package service
+
+import scala.slick.jdbc.{StaticQuery => Q}
+import Q.interpolation
+
+import model.Profile._
+import profile.simple._
+import model.{Issue, IssueComment, IssueLabel, Label}
+import util.Implicits._
+import util.StringUtil._
+
+trait IssuesService {
+  import IssuesService._
+
+  def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =
+    if (issueId forall (_.isDigit))
+      Issues filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
+    else None
+
+  def getComments(owner: String, repository: String, issueId: Int)(implicit s: Session) =
+    IssueComments filter (_.byIssue(owner, repository, issueId)) list
+
+  def getComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
+    if (commentId forall (_.isDigit))
+      IssueComments filter { t =>
+        t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
+      } firstOption
+    else None
+
+  def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session) =
+    IssueLabels
+      .innerJoin(Labels).on { (t1, t2) =>
+        t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
+      }
+      .filter ( _._1.byIssue(owner, repository, issueId) )
+      .map    ( _._2 )
+      .list
+
+  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
+
+  /**
+   * Returns the count of the search result against  issues.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
+   * @param repos Tuple of the repository owner and the repository name
+   * @return the count of the search result
+   */
+  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+                 repos: (String, String)*)(implicit s: Session): Int =
+    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
+
+  /**
+   * Returns the Map which contains issue count for each labels.
+   *
+   * @param owner the repository owner
+   * @param repository the repository name
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @return the Map which contains issue count for each labels (key is label name, value is issue count)
+   */
+  def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
+                              filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
+
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false)
+      .innerJoin(IssueLabels).on { (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .innerJoin(Labels).on { case ((t1, t2), t3) =>
+        t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
+      }
+      .groupBy { case ((t1, t2), t3) =>
+        t3.labelName
+      }
+      .map { case (labelName, t) =>
+        labelName -> t.length
+      }
+      .toMap
+  }
+  /**
+   * Returns list which contains issue count for each repository.
+   * If the issue does not exist, its repository is not included in the result.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
+   * @param repos Tuple of the repository owner and the repository name
+   * @return list which contains issue count for each repository
+   */
+  def countIssueGroupByRepository(
+      condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+      repos: (String, String)*)(implicit s: Session): List[(String, String, Int)] = {
+    searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest)
+      .groupBy { t =>
+        t.userName -> t.repositoryName
+      }
+      .map { case (repo, t) =>
+        (repo._1, repo._2, t.length)
+      }
+      .sortBy(_._3 desc)
+      .list
+  }
+
+  /**
+   * Returns the search result against  issues.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
+   * @param offset the offset for pagination
+   * @param limit the limit for pagination
+   * @param repos Tuple of the repository owner and the repository name
+   * @return the search result (list of tuples which contain issue, labels and comment count)
+   */
+  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+                  offset: Int, limit: Int, repos: (String, String)*)
+                 (implicit s: Session): List[(Issue, List[Label], Int)] = {
+
+    // get issues and comment count and labels
+    searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
+        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
+        .sortBy { case (t1, t2) =>
+          (condition.sort match {
+            case "created"  => t1.registeredDate
+            case "comments" => t2.commentCount
+            case "updated"  => t1.updatedDate
+          }) match {
+            case sort => condition.direction match {
+              case "asc"  => sort asc
+              case "desc" => sort desc
+            }
+          }
+        }
+        .drop(offset).take(limit)
+        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .map { case (((t1, t2), t3), t4) =>
+          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
+        }
+        .list
+        .splitWith { (c1, c2) =>
+          c1._1.userName == c2._1.userName &&
+          c1._1.repositoryName == c2._1.repositoryName &&
+          c1._1.issueId == c2._1.issueId
+        }
+        .map { issues => issues.head match {
+          case (issue, commentCount, _,_,_) =>
+            (issue,
+             issues.flatMap { t => t._3.map (
+                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
+             )} toList,
+             commentCount)
+        }} toList
+  }
+
+  /**
+   * Assembles query for conditional issue searching.
+   */
+  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition,
+                               filterUser: Map[String, String], onlyPullRequest: Boolean)(implicit s: Session) =
+    Issues filter { t1 =>
+      condition.repo
+          .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
+          .getOrElse (repos)
+          .map { case (owner, repository) => t1.byRepository(owner, repository) }
+          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
+      (t1.closed           === (condition.state == "closed").bind) &&
+      (t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
+      (t1.milestoneId.?    isEmpty, condition.milestoneId == Some(None)) &&
+      (t1.assignedUserName === filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
+      (t1.openedUserName   === filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
+      (t1.openedUserName   =!= filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
+      (t1.pullRequest      === true.bind, onlyPullRequest) &&
+      (IssueLabels filter { t2 =>
+        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
+        (t2.labelId in
+          (Labels filter { t3 =>
+            (t3.byRepository(t1.userName, t1.repositoryName)) &&
+            (t3.labelName inSetBind condition.labels)
+          } map(_.labelId)))
+      } exists, condition.labels.nonEmpty)
+    }
+
+  def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
+                  assignedUserName: Option[String], milestoneId: Option[Int],
+                  isPullRequest: Boolean = false)(implicit s: Session) =
+    // next id number
+    sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
+        .firstOption.filter { id =>
+      Issues insert Issue(
+          owner,
+          repository,
+          id,
+          loginUser,
+          milestoneId,
+          assignedUserName,
+          title,
+          content,
+          false,
+          currentDate,
+          currentDate,
+          isPullRequest)
+
+      // increment issue id
+      IssueId
+        .filter (_.byPrimaryKey(owner, repository))
+        .map (_.issueId)
+        .update (id) > 0
+    } get
+
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels insert IssueLabel(owner, repository, issueId, labelId)
+
+  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
+
+  def createComment(owner: String, repository: String, loginUser: String,
+      issueId: Int, content: String, action: String)(implicit s: Session): Int =
+    IssueComments.autoInc insert IssueComment(
+        userName          = owner,
+        repositoryName    = repository,
+        issueId           = issueId,
+        action            = action,
+        commentedUserName = loginUser,
+        content           = content,
+        registeredDate    = currentDate,
+        updatedDate       = currentDate)
+
+  def updateIssue(owner: String, repository: String, issueId: Int,
+      title: String, content: Option[String])(implicit s: Session) =
+    Issues
+      .filter (_.byPrimaryKey(owner, repository, issueId))
+      .map { t =>
+        (t.title, t.content.?, t.updatedDate)
+      }
+      .update (title, content, currentDate)
+
+  def updateAssignedUserName(owner: String, repository: String, issueId: Int,
+                             assignedUserName: Option[String])(implicit s: Session) =
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
+
+  def updateMilestoneId(owner: String, repository: String, issueId: Int,
+                        milestoneId: Option[Int])(implicit s: Session) =
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
+
+  def updateComment(commentId: Int, content: String)(implicit s: Session) =
+    IssueComments
+      .filter (_.byPrimaryKey(commentId))
+      .map { t =>
+        t.content -> t.updatedDate
+      }
+      .update (content, currentDate)
+
+  def deleteComment(commentId: Int)(implicit s: Session) =
+    IssueComments filter (_.byPrimaryKey(commentId)) delete
+
+  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session) =
+    Issues
+      .filter (_.byPrimaryKey(owner, repository, issueId))
+      .map { t =>
+        t.closed -> t.updatedDate
+      }
+      .update (closed, currentDate)
+
+  /**
+   * Search issues by keyword.
+   *
+   * @param owner the repository owner
+   * @param repository the repository name
+   * @param query the keywords separated by whitespace.
+   * @return issues with comment count and matched content of issue or comment
+   */
+  def searchIssuesByKeyword(owner: String, repository: String, query: String)
+                           (implicit s: Session): List[(Issue, Int, String)] = {
+    import slick.driver.JdbcDriver.likeEncode
+    val keywords = splitWords(query.toLowerCase)
+
+    // Search Issue
+    val issues = Issues
+      .innerJoin(IssueOutline).on { case (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .filter { case (t1, t2) =>
+        keywords.map { keyword =>
+          (t1.title.toLowerCase   like (s"%${likeEncode(keyword)}%", '^')) ||
+          (t1.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
+        } .reduceLeft(_ && _)
+      }
+      .map { case (t1, t2) =>
+        (t1, 0, t1.content.?, t2.commentCount)
+      }
+
+    // Search IssueComment
+    val comments = IssueComments
+      .innerJoin(Issues).on { case (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
+        t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
+      }
+      .filter { case ((t1, t2), t3) =>
+        keywords.map { query =>
+          t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
+        }.reduceLeft(_ && _)
+      }
+      .map { case ((t1, t2), t3) =>
+        (t2, t1.commentId, t1.content.?, t3.commentCount)
+      }
+
+    issues.union(comments).sortBy { case (issue, commentId, _, _) =>
+      issue.issueId -> commentId
+    }.list.splitWith { case ((issue1, _, _, _), (issue2, _, _, _)) =>
+      issue1.issueId == issue2.issueId
+    }.map { _.head match {
+        case (issue, _, content, commentCount) => (issue, commentCount, content.getOrElse(""))
+      }
+    }.toList
+  }
+
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(implicit s: Session) = {
+    extractCloseId(message).foreach { issueId =>
+      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
+        createComment(owner, repository, userName, issue.issueId, "Close", "close")
+        updateClosed(owner, repository, issue.issueId, true)
+      }
+    }
+  }
+}
+
+object IssuesService {
+  import javax.servlet.http.HttpServletRequest
+
+  val IssueLimit = 30
+
+  case class IssueSearchCondition(
+      labels: Set[String] = Set.empty,
+      milestoneId: Option[Option[Int]] = None,
+      repo: Option[String] = None,
+      state: String = "open",
+      sort: String = "created",
+      direction: String = "desc"){
+
+    def toURL: String =
+      "?" + List(
+        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
+        milestoneId.map { id => "milestone=" + (id match {
+          case Some(x) => x.toString
+          case None    => "none"
+        })},
+        repo.map("for="   + urlEncode(_)),
+        Some("state="     + urlEncode(state)),
+        Some("sort="      + urlEncode(sort)),
+        Some("direction=" + urlEncode(direction))).flatten.mkString("&")
+
+  }
+
+  object IssueSearchCondition {
+
+    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)
+    }
+
+    def apply(request: HttpServletRequest): IssueSearchCondition =
+      IssueSearchCondition(
+        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
+        param(request, "milestone").map{
+          case "none" => None
+          case x      => x.toIntOpt
+        },
+        param(request, "for"),
+        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
+        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
+        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"))
+
+    def page(request: HttpServletRequest) = try {
+      val i = param(request, "page").getOrElse("1").toInt
+      if(i <= 0) 1 else i
+    } catch {
+      case e: NumberFormatException => 1
+    }
+  }
+
+}
--- a/src/main/scala/service/LabelsService.scala
+++ b/src/main/scala/service/LabelsService.scala
@@ -1,26 +1,32 @@
 package service

-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.Label

 trait LabelsService {

-  def getLabels(owner: String, repository: String): List[Label] =
-    Query(Labels).filter(_.byRepository(owner, repository)).sortBy(_.labelName asc).list
+  def getLabels(owner: String, repository: String)(implicit s: Session): List[Label] =
+    Labels.filter(_.byRepository(owner, repository)).sortBy(_.labelName asc).list

-  def getLabel(owner: String, repository: String, labelId: Int): Option[Label] =
-    Query(Labels).filter(_.byPrimaryKey(owner, repository, labelId)).firstOption
+  def getLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Option[Label] =
+    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).firstOption

-  def createLabel(owner: String, repository: String, labelName: String, color: String): Unit =
-    Labels.ins insert (owner, repository, labelName, color)
+  def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Unit =
+    Labels insert Label(
+      userName       = owner,
+      repositoryName = repository,
+      labelName      = labelName,
+      color          = color
+    )

-  def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String): Unit =
-    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).map(t => t.labelName ~ t.color)
-      .update(labelName, color)
+  def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String)
+                 (implicit s: Session): Unit =
+    Labels.filter(_.byPrimaryKey(owner, repository, labelId))
+          .map(t => t.labelName -> t.color)
+          .update(labelName, color)

-  def deleteLabel(owner: String, repository: String, labelId: Int): Unit = {
+  def deleteLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Unit = {
    IssueLabels.filter(_.byLabel(owner, repository, labelId)).delete
    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).delete
  }
--- a/src/main/scala/service/MilestonesService.scala
+++ b/src/main/scala/service/MilestonesService.scala
@@ -1,39 +1,49 @@
 package service

-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.Milestone
+// TODO [Slick 2.0]NOT import directly?
+import model.Profile.dateColumnType

 trait MilestonesService {

  def createMilestone(owner: String, repository: String, title: String, description: Option[String],
-                      dueDate: Option[java.util.Date]): Unit =
-    Milestones.ins insert (owner, repository, title, description, dueDate, None)
+                      dueDate: Option[java.util.Date])(implicit s: Session): Unit =
+    Milestones insert Milestone(
+      userName       = owner,
+      repositoryName = repository,
+      title          = title,
+      description    = description,
+      dueDate        = dueDate,
+      closedDate     = None
+    )

-  def updateMilestone(milestone: Milestone): Unit =
+  def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
    Milestones
-      .filter (t => t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
-      .map    (t => t.title ~ t.description.? ~ t.dueDate.? ~ t.closedDate.?)
+      .filter (t =>  t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
+      .map    (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?))
      .update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate)

-  def openMilestone(milestone: Milestone): Unit = updateMilestone(milestone.copy(closedDate = None))
+  def openMilestone(milestone: Milestone)(implicit s: Session): Unit =
+    updateMilestone(milestone.copy(closedDate = None))

-  def closeMilestone(milestone: Milestone): Unit = updateMilestone(milestone.copy(closedDate = Some(currentDate)))
+  def closeMilestone(milestone: Milestone)(implicit s: Session): Unit =
+    updateMilestone(milestone.copy(closedDate = Some(currentDate)))

-  def deleteMilestone(owner: String, repository: String, milestoneId: Int): Unit = {
+  def deleteMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Unit = {
    Issues.filter(_.byMilestone(owner, repository, milestoneId)).map(_.milestoneId.?).update(None)
    Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).delete
  }

-  def getMilestone(owner: String, repository: String, milestoneId: Int): Option[Milestone] =
-    Query(Milestones).filter(_.byPrimaryKey(owner, repository, milestoneId)).firstOption
+  def getMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Option[Milestone] =
+    Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).firstOption

-  def getMilestonesWithIssueCount(owner: String, repository: String): List[(Milestone, Int, Int)] = {
+  def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
    val counts = Issues
-      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) }
-      .groupBy { t => t.milestoneId ~ t.closed }
-      .map     { case (t1, t2) => (t1._1 ~ t1._2) -> t2.length }
+      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
+      .groupBy { t => t.milestoneId -> t.closed }
+      .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
      .toMap

    getMilestones(owner, repository).map { milestone =>
@@ -41,6 +51,7 @@ trait MilestonesService {
    }
  }

-  def getMilestones(owner: String, repository: String): List[Milestone] =
-    Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
+  def getMilestones(owner: String, repository: String)(implicit s: Session): List[Milestone] =
+    Milestones.filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
+
 }
--- a/src/main/scala/service/PullRequestService.scala
+++ b/src/main/scala/service/PullRequestService.scala
@@ -1,41 +1,45 @@
 package service

-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-import model._
-import util.ControlUtil._
+import model.Profile._
+import profile.simple._
+import model.{PullRequest, Issue}

 trait PullRequestService { self: IssuesService =>
  import PullRequestService._

-  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
+  def getPullRequest(owner: String, repository: String, issueId: Int)
+                    (implicit s: Session): Option[(Issue, PullRequest)] =
    getIssue(owner, repository, issueId.toString).flatMap{ issue =>
-      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
+      PullRequests.filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
        pullreq => (issue, pullreq)
      }
    }

-  def updateCommitIdTo(owner: String, repository: String, issueId: Int, commitIdTo: String): Unit =
-    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).map(_.commitIdTo).update(commitIdTo)
+  def updateCommitId(owner: String, repository: String, issueId: Int, commitIdTo: String, commitIdFrom: String)
+                    (implicit s: Session): Unit =
+    PullRequests.filter(_.byPrimaryKey(owner, repository, issueId))
+                .map(pr => pr.commitIdTo -> pr.commitIdFrom)
+                .update((commitIdTo, commitIdFrom))

-  def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
-    Query(PullRequests)
+  def getPullRequestCountGroupByUser(closed: Boolean, owner: Option[String], repository: Option[String])
+                                    (implicit s: Session): List[PullRequestCount] =
+    PullRequests
      .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
      .filter { case (t1, t2) =>
-        (t2.closed         is closed.bind) &&
-        (t1.userName       is owner.bind) &&
-        (t1.repositoryName is repository.get.bind, repository.isDefined)
+        (t2.closed         === closed.bind) &&
+        (t1.userName       === owner.get.bind, owner.isDefined) &&
+        (t1.repositoryName === repository.get.bind, repository.isDefined)
      }
      .groupBy { case (t1, t2) => t2.openedUserName }
-      .map { case (userName, t) => userName ~ t.length }
+      .map { case (userName, t) => userName -> t.length }
      .sortBy(_._2 desc)
      .list
      .map { x => PullRequestCount(x._1, x._2) }

  def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
        originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,
-        commitIdFrom: String, commitIdTo: String): Unit =
-    PullRequests insert (PullRequest(
+        commitIdFrom: String, commitIdTo: String)(implicit s: Session): Unit =
+    PullRequests insert PullRequest(
      originUserName,
      originRepositoryName,
      issueId,
@@ -44,16 +48,17 @@ trait PullRequestService { self: IssuesService =>
      requestRepositoryName,
      requestBranch,
      commitIdFrom,
-      commitIdTo))
+      commitIdTo)

-  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean): List[PullRequest] =
-    Query(PullRequests)
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean)
+                              (implicit s: Session): List[PullRequest] =
+    PullRequests
      .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
      .filter { case (t1, t2) =>
-        (t1.requestUserName       is userName.bind) &&
-        (t1.requestRepositoryName is repositoryName.bind) &&
-        (t1.requestBranch         is branch.bind) &&
-        (t2.closed                is closed.bind)
+        (t1.requestUserName       === userName.bind) &&
+        (t1.requestRepositoryName === repositoryName.bind) &&
+        (t1.requestBranch         === branch.bind) &&
+        (t2.closed                === closed.bind)
      }
      .map { case (t1, t2) => t1 }
      .list
--- a/src/main/scala/service/RepositorySearchService.scala
+++ b/src/main/scala/service/RepositorySearchService.scala
@@ -3,21 +3,20 @@ package service
 import util.{FileUtil, StringUtil, JGitUtil}
 import util.Directory._
 import util.ControlUtil._
-import model.Issue
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
-import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
+import model.Profile._
+import profile.simple._

-trait
-RepositorySearchService { self: IssuesService =>
+trait RepositorySearchService { self: IssuesService =>
  import RepositorySearchService._

-  def countIssues(owner: String, repository: String, query: String): Int =
+  def countIssues(owner: String, repository: String, query: String)(implicit session: Session): Int =
    searchIssuesByKeyword(owner, repository, query).length

-  def searchIssues(owner: String, repository: String, query: String): List[IssueSearchResult] =
+  def searchIssues(owner: String, repository: String, query: String)(implicit session: Session): List[IssueSearchResult] =
    searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) =>
      IssueSearchResult(
        issue.issueId,
@@ -39,7 +38,7 @@ RepositorySearchService { self: IssuesService =>
        Nil
      } else {
        val files = searchRepositoryFiles(git, query)
-        val commits = JGitUtil.getLatestCommitFromPaths(git, files.toList.map(_._1), "HEAD")
+        val commits = JGitUtil.getLatestCommitFromPaths(git, files.map(_._1), "HEAD")
        files.map { case (path, text) =>
          val (highlightText, lineNumber)  = getHighlightText(text, query)
          FileSearchResult(
@@ -60,7 +59,7 @@ RepositorySearchService { self: IssuesService =>
    treeWalk.addTree(revCommit.getTree)

    val keywords = StringUtil.splitWords(query.toLowerCase)
-    val list = new ListBuffer[(String, String)]
+    val list = new scala.collection.mutable.ListBuffer[(String, String)]

    while (treeWalk.next()) {
      val mode = treeWalk.getFileMode(0)
@@ -108,7 +107,7 @@ object RepositorySearchService {

  case class SearchResult(
    files : List[(String, String)],
-    issues: List[(Issue, Int, String)])
+    issues: List[(model.Issue, Int, String)])

  case class IssueSearchResult(
    issueId: Int,
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -1,8 +1,8 @@
 package service

-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.{Repository, Account, Collaborator}
 import util.JGitUtil

 trait RepositoryService { self: AccountService =>
@@ -20,7 +20,8 @@ trait RepositoryService { self: AccountService =>
   */
  def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean,
                       originRepositoryName: Option[String] = None, originUserName: Option[String] = None,
-                       parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None): Unit = {
+                       parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None)
+                      (implicit s: Session): Unit = {
    Repositories insert
      Repository(
        userName             = userName,
@@ -39,70 +40,83 @@ trait RepositoryService { self: AccountService =>
    IssueId insert (userName, repositoryName, 0)
  }

-  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
-    (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
-      Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String)
+                      (implicit s: Session): Unit = {
+    getAccountByUserName(newUserName).foreach { account =>
+      (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+        Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)

-      val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val commitLog     = Query(CommitLog    ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHooks      = WebHooks     .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val milestones    = Milestones   .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueId       = IssueId      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issues        = Issues       .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val pullRequests  = PullRequests .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val labels        = Labels       .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueComments = IssueComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueLabels   = IssueLabels  .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val activities    = Activities   .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val collaborators = Collaborators.filter(_.byRepository(oldUserName, oldRepositoryName)).list

-      Repositories.filter { t =>
-        (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
-      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+        Repositories.filter { t =>
+          (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
+        }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)

-      Repositories.filter { t =>
-        (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
-      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+        Repositories.filter { t =>
+          (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
+        }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)

-      PullRequests.filter { t =>
-        t.requestRepositoryName is oldRepositoryName.bind
-      }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+        PullRequests.filter { t =>
+          t.requestRepositoryName === oldRepositoryName.bind
+        }.map { t => t.requestUserName -> t.requestRepositoryName }.update(newUserName, newRepositoryName)

-      deleteRepository(oldUserName, oldRepositoryName)
+        deleteRepository(oldUserName, oldRepositoryName)

-      WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-      Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      CommitLog     .insertAll(commitLog     .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-      Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)

-      // Update activity messages
-      val updateActivities = Activities.filter { t =>
-        (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
-        (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
-      }.map { t => t.activityId ~ t.message }.list
+        val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+        Issues.insertAll(issues.map { x => x.copy(
+          userName       = newUserName,
+          repositoryName = newRepositoryName,
+          milestoneId    = x.milestoneId.map { id =>
+            newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+          }
+        )} :_*)

-      updateActivities.foreach { case (activityId, message) =>
-        Activities.filter(_.activityId is activityId.bind).map(_.message).update(
-          message
-            .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
-            .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
-            .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
-            .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
-            .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
-        )
+        PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        if(account.isGroupAccount){
+          Collaborators.insertAll(getGroupMembers(newUserName).map(m => Collaborator(newUserName, newRepositoryName, m.userName)) :_*)
+        } else {
+          Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        }
+
+        // Update activity messages
+        val updateActivities = Activities.filter { t =>
+          (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+          (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
+        }.map { t => t.activityId -> t.message }.list
+
+        updateActivities.foreach { case (activityId, message) =>
+          Activities.filter(_.activityId === activityId.bind).map(_.message).update(
+            message
+              .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
+              .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
+              .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
+              .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
+              .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
+          )
+        }
      }
    }
  }

-  def deleteRepository(userName: String, repositoryName: String): Unit = {
+  def deleteRepository(userName: String, repositoryName: String)(implicit s: Session): 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
@@ -121,8 +135,8 @@ trait RepositoryService { self: AccountService =>
   * @param userName the user name of repository owner
   * @return the list of repository names
   */
-  def getRepositoryNamesOfUser(userName: String): List[String] =
-    Query(Repositories) filter(_.userName is userName.bind) map (_.repositoryName) list
+  def getRepositoryNamesOfUser(userName: String)(implicit s: Session): List[String] =
+    Repositories filter(_.userName === userName.bind) map (_.repositoryName) list

  /**
   * Returns the specified repository information.
@@ -132,11 +146,11 @@ trait RepositoryService { self: AccountService =>
   * @param baseUrl the base url of this application
   * @return the repository information
   */
-  def getRepository(userName: String, repositoryName: String, baseUrl: String): Option[RepositoryInfo] = {
-    (Query(Repositories) filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
+  def getRepository(userName: String, repositoryName: String, baseUrl: String)(implicit s: Session): Option[RepositoryInfo] = {
+    (Repositories filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
      // for getting issue count and pull request count
-      val issues = Query(Issues).filter { t =>
-        t.byRepository(repository.userName, repository.repositoryName) && (t.closed is false.bind)
+      val issues = Issues.filter { t =>
+        t.byRepository(repository.userName, repository.repositoryName) && (t.closed === false.bind)
      }.map(_.pullRequest).list

      new RepositoryInfo(
@@ -152,13 +166,24 @@ trait RepositoryService { self: AccountService =>
    }
  }

-  def getUserRepositories(userName: String, baseUrl: String): List[RepositoryInfo] = {
-    Query(Repositories).filter { t1 =>
-      (t1.userName is userName.bind) ||
-        (Query(Collaborators).filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName is userName.bind)} exists)
+  def getAllRepositories()(implicit s: Session): List[(String, String)] = {
+    Repositories.sortBy(_.lastActivityDate desc).map{ t =>
+      (t.userName, t.repositoryName)
+    }.list
+  }
+
+  def getUserRepositories(userName: String, baseUrl: String, withoutPhysicalInfo: Boolean = false)
+                         (implicit s: Session): List[RepositoryInfo] = {
+    Repositories.filter { t1 =>
+      (t1.userName === userName.bind) ||
+        (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName === userName.bind)} exists)
    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
      new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        if(withoutPhysicalInfo){
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        } else {
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        },
        repository,
        getForkedCount(
          repository.originUserName.getOrElse(repository.userName),
@@ -175,24 +200,32 @@ trait RepositoryService { self: AccountService =>
   * @param loginAccount the logged in account
   * @param baseUrl the base url of this application
   * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
+   * @param withoutPhysicalInfo if true then the result does not include physical repository information such as commit count,
+   *                            branches and tags
   * @return the repository information which is sorted in descending order of lastActivityDate.
   */
-  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None): List[RepositoryInfo] = {
+  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None,
+                             withoutPhysicalInfo: Boolean = false)
+                            (implicit s: Session): List[RepositoryInfo] = {
    (loginAccount match {
      // for Administrators
-      case Some(x) if(x.isAdmin) => Query(Repositories)
+      case Some(x) if(x.isAdmin) => Repositories
      // for Normal Users
      case Some(x) if(!x.isAdmin) =>
-        Query(Repositories) filter { t => (t.isPrivate is false.bind) || (t.userName is x.userName) ||
-          (Query(Collaborators).filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
+        Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) ||
+          (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName === x.userName.bind)} exists)
        }
      // for Guests
-      case None => Query(Repositories) filter(_.isPrivate is false.bind)
+      case None => Repositories filter(_.isPrivate === false.bind)
    }).filter { t =>
-      repositoryUserName.map { userName => t.userName is userName.bind } getOrElse ConstColumn.TRUE
+      repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true)
    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
      new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        if(withoutPhysicalInfo){
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        } else {
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        },
        repository,
        getForkedCount(
          repository.originUserName.getOrElse(repository.userName),
@@ -202,7 +235,7 @@ trait RepositoryService { self: AccountService =>
    }
  }

-  private def getRepositoryManagers(userName: String): Seq[String] =
+  private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] =
    if(getAccountByUserName(userName).exists(_.isGroupAccount)){
      getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
    } else {
@@ -212,16 +245,16 @@ trait RepositoryService { self: AccountService =>
  /**
   * Updates the last activity date of the repository.
   */
-  def updateLastActivityDate(userName: String, repositoryName: String): Unit =
+  def updateLastActivityDate(userName: String, repositoryName: String)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName)).map(_.lastActivityDate).update(currentDate)
-  
+
  /**
   * Save repository options.
   */
  def saveRepositoryOptions(userName: String, repositoryName: String, 
-      description: Option[String], defaultBranch: String, isPrivate: Boolean): Unit =
+      description: Option[String], defaultBranch: String, isPrivate: Boolean)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => r.description.? ~ r.defaultBranch ~ r.isPrivate ~ r.updatedDate }
+      .map { r => (r.description.?, r.defaultBranch, r.isPrivate, r.updatedDate) }
      .update (description, defaultBranch, isPrivate, currentDate)

  /**
@@ -231,8 +264,8 @@ trait RepositoryService { self: AccountService =>
   * @param repositoryName the repository name
   * @param collaboratorName the collaborator name
   */
-  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
-    Collaborators insert(Collaborator(userName, repositoryName, collaboratorName))
+  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
+    Collaborators insert Collaborator(userName, repositoryName, collaboratorName)

  /**
   * Remove collaborator from the repository.
@@ -241,7 +274,7 @@ trait RepositoryService { self: AccountService =>
   * @param repositoryName the repository name
   * @param collaboratorName the collaborator name
   */
-  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
+  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
    Collaborators.filter(_.byPrimaryKey(userName, repositoryName, collaboratorName)).delete

  /**
@@ -250,7 +283,7 @@ trait RepositoryService { self: AccountService =>
   * @param userName the user name of the repository owner
   * @param repositoryName the repository name
   */
-  def removeCollaborators(userName: String, repositoryName: String): Unit =
+  def removeCollaborators(userName: String, repositoryName: String)(implicit s: Session): Unit =
    Collaborators.filter(_.byRepository(userName, repositoryName)).delete

  /**
@@ -260,10 +293,10 @@ trait RepositoryService { self: AccountService =>
   * @param repositoryName the repository name
   * @return the list of collaborators name
   */
-  def getCollaborators(userName: String, repositoryName: String): List[String] =
-    Query(Collaborators).filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list
+  def getCollaborators(userName: String, repositoryName: String)(implicit s: Session): List[String] =
+    Collaborators.filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list

-  def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account]): Boolean = {
+  def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
    loginAccount match {
      case Some(a) if(a.isAdmin) => true
      case Some(a) if(a.userName == owner) => true
@@ -272,17 +305,17 @@ trait RepositoryService { self: AccountService =>
    }
  }

-  private def getForkedCount(userName: String, repositoryName: String): Int =
+  private def getForkedCount(userName: String, repositoryName: String)(implicit s: Session): Int =
    Query(Repositories.filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
    }.length).first


-  def getForkedRepositories(userName: String, repositoryName: String): List[(String, String)] =
-    Query(Repositories).filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+  def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
+    Repositories.filter { t =>
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
    }
-    .sortBy(_.userName asc).map(t => t.userName ~ t.repositoryName).list
+    .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list

 }

--- a/src/main/scala/service/RequestCache.scala
+++ b/src/main/scala/service/RequestCache.scala
@@ -1,6 +1,7 @@
 package service

-import model._
+import model.{Account, Issue, Session}
+import util.Implicits.request2Session

 /**
 * This service is used for a view helper mainly.
@@ -10,22 +11,27 @@ import model._
 */
 trait RequestCache extends SystemSettingsService with AccountService with IssuesService {

-  def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
+  private implicit def context2Session(implicit context: app.Context): Session =
+    request2Session(context.request)
+
+  def getIssue(userName: String, repositoryName: String, issueId: String)
+              (implicit context: app.Context): Option[Issue] = {
    context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
      super.getIssue(userName, repositoryName, issueId)
    }
  }

-  def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
+  def getAccountByUserName(userName: String)
+                          (implicit context: app.Context): Option[Account] = {
    context.cache(s"account.${userName}"){
      super.getAccountByUserName(userName)
    }
  }

-  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
+  def getAccountByMailAddress(mailAddress: String)
+                             (implicit context: app.Context): Option[Account] = {
    context.cache(s"account.${mailAddress}"){
      super.getAccountByMailAddress(mailAddress)
    }
  }
 }
-
--- a/src/main/scala/service/SshKeyService.scala
+++ b/src/main/scala/service/SshKeyService.scala
@@ -1,19 +1,18 @@
 package service

-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.SshKey

 trait SshKeyService {

-  def addPublicKey(userName: String, title: String, publicKey: String): Unit =
-    SshKeys.ins insert (userName, title, publicKey)
+  def addPublicKey(userName: String, title: String, publicKey: String)(implicit s: Session): Unit =
+    SshKeys insert SshKey(userName = userName, title = title, publicKey = publicKey)

-  def getPublicKeys(userName: String): List[SshKey] =
-    Query(SshKeys).filter(_.userName is userName.bind).sortBy(_.sshKeyId).list
+  def getPublicKeys(userName: String)(implicit s: Session): List[SshKey] =
+    SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list

-  def deletePublicKey(userName: String, sshKeyId: Int): Unit =
+  def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
    SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete

-
 }
--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -1,184 +1,194 @@
-package service
-
-import util.Directory._
-import util.ControlUtil._
-import SystemSettingsService._
-import javax.servlet.http.HttpServletRequest
-
-trait SystemSettingsService {
-
-  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse {
-    defining(request.getRequestURL.toString){ url =>
-      url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
-    }
-  }.replaceFirst("/$", "")
-
-  def saveSystemSettings(settings: SystemSettings): Unit = {
-    defining(new java.util.Properties()){ props =>
-      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
-      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-      props.setProperty(Gravatar, settings.gravatar.toString)
-      props.setProperty(Notification, settings.notification.toString)
-      props.setProperty(Ssh, settings.ssh.toString)
-      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
-      if(settings.notification) {
-        settings.smtp.foreach { smtp =>
-          props.setProperty(SmtpHost, smtp.host)
-          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-          smtp.user.foreach(props.setProperty(SmtpUser, _))
-          smtp.password.foreach(props.setProperty(SmtpPassword, _))
-          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
-          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
-          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
-        }
-      }
-      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
-      if(settings.ldapAuthentication){
-        settings.ldap.map { ldap =>
-          props.setProperty(LdapHost, ldap.host)
-          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
-          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
-          props.setProperty(LdapBaseDN, ldap.baseDN)
-          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
-          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
-          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
-          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
-        }
-      }
-      props.store(new java.io.FileOutputStream(GitBucketConf), null)
-    }
-  }
-
-
-  def loadSystemSettings(): SystemSettings = {
-    defining(new java.util.Properties()){ props =>
-      if(GitBucketConf.exists){
-        props.load(new java.io.FileInputStream(GitBucketConf))
-      }
-      SystemSettings(
-        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
-        getValue(props, AllowAccountRegistration, false),
-        getValue(props, Gravatar, true),
-        getValue(props, Notification, false),
-        getValue(props, Ssh, false),
-        getOptionValue(props, SshPort, Some(DefaultSshPort)),
-        if(getValue(props, Notification, false)){
-          Some(Smtp(
-            getValue(props, SmtpHost, ""),
-            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
-            getOptionValue(props, SmtpUser, None),
-            getOptionValue(props, SmtpPassword, None),
-            getOptionValue[Boolean](props, SmtpSsl, None),
-            getOptionValue(props, SmtpFromAddress, None),
-            getOptionValue(props, SmtpFromName, None)))
-        } else {
-          None
-        },
-        getValue(props, LdapAuthentication, false),
-        if(getValue(props, LdapAuthentication, false)){
-          Some(Ldap(
-            getValue(props, LdapHost, ""),
-            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
-            getOptionValue(props, LdapBindDN, None),
-            getOptionValue(props, LdapBindPassword, None),
-            getValue(props, LdapBaseDN, ""),
-            getValue(props, LdapUserNameAttribute, ""),
-            getOptionValue(props, LdapFullNameAttribute, None),
-            getValue(props, LdapMailAddressAttribute, ""),
-            getOptionValue[Boolean](props, LdapTls, None),
-            getOptionValue(props, LdapKeystore, None)))
-        } else {
-          None
-        }
-      )
-    }
-  }
-
-}
-
-object SystemSettingsService {
-  import scala.reflect.ClassTag
-
-  case class SystemSettings(
-    baseUrl: Option[String],
-    allowAccountRegistration: Boolean,
-    gravatar: Boolean,
-    notification: Boolean,
-    ssh: Boolean,
-    sshPort: Option[Int],
-    smtp: Option[Smtp],
-    ldapAuthentication: Boolean,
-    ldap: Option[Ldap])
-
-  case class Ldap(
-    host: String,
-    port: Option[Int],
-    bindDN: Option[String],
-    bindPassword: Option[String],
-    baseDN: String,
-    userNameAttribute: String,
-    fullNameAttribute: Option[String],
-    mailAttribute: String,
-    tls: Option[Boolean],
-    keystore: Option[String])
-
-  case class Smtp(
-    host: String,
-    port: Option[Int],
-    user: Option[String],
-    password: Option[String],
-    ssl: Option[Boolean],
-    fromAddress: Option[String],
-    fromName: Option[String])
-
-  val DefaultSshPort = 29418
-  val DefaultSmtpPort = 25
-  val DefaultLdapPort = 389
-
-  private val BaseURL = "base_url"
-  private val AllowAccountRegistration = "allow_account_registration"
-  private val Gravatar = "gravatar"
-  private val Notification = "notification"
-  private val Ssh = "ssh"
-  private val SshPort = "ssh.port"
-  private val SmtpHost = "smtp.host"
-  private val SmtpPort = "smtp.port"
-  private val SmtpUser = "smtp.user"
-  private val SmtpPassword = "smtp.password"
-  private val SmtpSsl = "smtp.ssl"
-  private val SmtpFromAddress = "smtp.from_address"
-  private val SmtpFromName = "smtp.from_name"
-  private val LdapAuthentication = "ldap_authentication"
-  private val LdapHost = "ldap.host"
-  private val LdapPort = "ldap.port"
-  private val LdapBindDN = "ldap.bindDN"
-  private val LdapBindPassword = "ldap.bind_password"
-  private val LdapBaseDN = "ldap.baseDN"
-  private val LdapUserNameAttribute = "ldap.username_attribute"
-  private val LdapFullNameAttribute = "ldap.fullname_attribute"
-  private val LdapMailAddressAttribute = "ldap.mail_attribute"
-  private val LdapTls = "ldap.tls"
-  private val LdapKeystore = "ldap.keystore"
-
-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
-    defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else convertType(value).asInstanceOf[A]
-    }
-
-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
-    defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else Some(convertType(value)).asInstanceOf[Option[A]]
-    }
-
-  private def convertType[A: ClassTag](value: String) =
-    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
-      if(c == classOf[Boolean])  value.toBoolean
-      else if(c == classOf[Int]) value.toInt
-      else value
-    }
-
-}
+package service
+
+import util.Directory._
+import util.ControlUtil._
+import SystemSettingsService._
+import javax.servlet.http.HttpServletRequest
+
+trait SystemSettingsService {
+
+  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)
+
+  def saveSystemSettings(settings: SystemSettings): Unit = {
+    defining(new java.util.Properties()){ props =>
+      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
+      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+      props.setProperty(Gravatar, settings.gravatar.toString)
+      props.setProperty(Notification, settings.notification.toString)
+      props.setProperty(Ssh, settings.ssh.toString)
+      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
+      if(settings.notification) {
+        settings.smtp.foreach { smtp =>
+          props.setProperty(SmtpHost, smtp.host)
+          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
+          smtp.user.foreach(props.setProperty(SmtpUser, _))
+          smtp.password.foreach(props.setProperty(SmtpPassword, _))
+          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
+          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
+        }
+      }
+      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
+      if(settings.ldapAuthentication){
+        settings.ldap.map { ldap =>
+          props.setProperty(LdapHost, ldap.host)
+          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
+          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+          props.setProperty(LdapBaseDN, ldap.baseDN)
+          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
+          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
+          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString))
+          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
+          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
+        }
+      }
+      using(new java.io.FileOutputStream(GitBucketConf)){ out =>
+        props.store(out, null)
+      }
+    }
+  }
+
+
+  def loadSystemSettings(): SystemSettings = {
+    defining(new java.util.Properties()){ props =>
+      if(GitBucketConf.exists){
+        using(new java.io.FileInputStream(GitBucketConf)){ in =>
+          props.load(in)
+        }
+      }
+      SystemSettings(
+        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
+        getValue(props, AllowAccountRegistration, false),
+        getValue(props, Gravatar, true),
+        getValue(props, Notification, false),
+        getValue(props, Ssh, false),
+        getOptionValue(props, SshPort, Some(DefaultSshPort)),
+        if(getValue(props, Notification, false)){
+          Some(Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)))
+        } else {
+          None
+        },
+        getValue(props, LdapAuthentication, false),
+        if(getValue(props, LdapAuthentication, false)){
+          Some(Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapAdditionalFilterCondition, None),
+            getOptionValue(props, LdapFullNameAttribute, None),
+            getOptionValue(props, LdapMailAddressAttribute, None),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue(props, LdapKeystore, None)))
+        } else {
+          None
+        }
+      )
+    }
+  }
+
+}
+
+object SystemSettingsService {
+  import scala.reflect.ClassTag
+
+  case class SystemSettings(
+    baseUrl: Option[String],
+    allowAccountRegistration: Boolean,
+    gravatar: Boolean,
+    notification: Boolean,
+    ssh: Boolean,
+    sshPort: Option[Int],
+    smtp: Option[Smtp],
+    ldapAuthentication: Boolean,
+    ldap: Option[Ldap]){
+    def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
+      defining(request.getRequestURL.toString){ url =>
+        url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
+      }
+    }.stripSuffix("/")
+  }
+
+  case class Ldap(
+    host: String,
+    port: Option[Int],
+    bindDN: Option[String],
+    bindPassword: Option[String],
+    baseDN: String,
+    userNameAttribute: String,
+    additionalFilterCondition: Option[String],
+    fullNameAttribute: Option[String],
+    mailAttribute: Option[String],
+    tls: Option[Boolean],
+    keystore: Option[String])
+
+  case class Smtp(
+    host: String,
+    port: Option[Int],
+    user: Option[String],
+    password: Option[String],
+    ssl: Option[Boolean],
+    fromAddress: Option[String],
+    fromName: Option[String])
+
+  val DefaultSshPort = 29418
+  val DefaultSmtpPort = 25
+  val DefaultLdapPort = 389
+
+  private val BaseURL = "base_url"
+  private val AllowAccountRegistration = "allow_account_registration"
+  private val Gravatar = "gravatar"
+  private val Notification = "notification"
+  private val Ssh = "ssh"
+  private val SshPort = "ssh.port"
+  private val SmtpHost = "smtp.host"
+  private val SmtpPort = "smtp.port"
+  private val SmtpUser = "smtp.user"
+  private val SmtpPassword = "smtp.password"
+  private val SmtpSsl = "smtp.ssl"
+  private val SmtpFromAddress = "smtp.from_address"
+  private val SmtpFromName = "smtp.from_name"
+  private val LdapAuthentication = "ldap_authentication"
+  private val LdapHost = "ldap.host"
+  private val LdapPort = "ldap.port"
+  private val LdapBindDN = "ldap.bindDN"
+  private val LdapBindPassword = "ldap.bind_password"
+  private val LdapBaseDN = "ldap.baseDN"
+  private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapAdditionalFilterCondition = "ldap.additional_filter_condition"
+  private val LdapFullNameAttribute = "ldap.fullname_attribute"
+  private val LdapMailAddressAttribute = "ldap.mail_attribute"
+  private val LdapTls = "ldap.tls"
+  private val LdapKeystore = "ldap.keystore"
+
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else convertType(value).asInstanceOf[A]
+    }
+
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else Some(convertType(value)).asInstanceOf[Option[A]]
+    }
+
+  private def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }
+
+}
--- a/src/main/scala/service/WebHookService.scala
+++ b/src/main/scala/service/WebHookService.scala
@@ -1,9 +1,8 @@
 package service

-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.{WebHook, Account}
 import org.slf4j.LoggerFactory
 import service.RepositoryService.RepositoryInfo
 import util.JGitUtil
@@ -12,7 +11,6 @@ import util.JGitUtil.CommitInfo
 import org.eclipse.jgit.api.Git
 import org.apache.http.message.BasicNameValuePair
 import org.apache.http.client.entity.UrlEncodedFormEntity
-import org.apache.http.protocol.HTTP
 import org.apache.http.NameValuePair

 trait WebHookService {
@@ -20,14 +18,14 @@ trait WebHookService {

  private val logger = LoggerFactory.getLogger(classOf[WebHookService])

-  def getWebHookURLs(owner: String, repository: String): List[WebHook] =
-    Query(WebHooks).filter(_.byRepository(owner, repository)).sortBy(_.url).list
+  def getWebHookURLs(owner: String, repository: String)(implicit s: Session): List[WebHook] =
+    WebHooks.filter(_.byRepository(owner, repository)).sortBy(_.url).list

-  def addWebHookURL(owner: String, repository: String, url :String): Unit =
-    WebHooks.insert(WebHook(owner, repository, url))
+  def addWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
+    WebHooks insert WebHook(owner, repository, url)

-  def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
-    Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
+  def deleteWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
+    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete

  def callWebHook(owner: String, repository: String, webHookURLs: List[WebHook], payload: WebHookPayload): Unit = {
    import org.json4s._
@@ -46,7 +44,7 @@ trait WebHookService {
      val httpClient = HttpClientBuilder.create.build

      webHookURLs.foreach { webHookUrl =>
-        val f = future {
+        val f = Future {
          logger.debug(s"start web hook invocation for ${webHookUrl}")
          val httpPost = new HttpPost(webHookUrl.url)

@@ -87,23 +85,23 @@ object WebHookService {
        refName,
        commits.map { commit =>
          val diffs = JGitUtil.getDiffs(git, commit.id, false)
-          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
+          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/commit/" + commit.id

          WebHookCommit(
            id        = commit.id,
            message   = commit.fullMessage,
-            timestamp = commit.time.toString,
+            timestamp = commit.commitTime.toString,
            url       = commitUrl,
            added     = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.ADD)    => x.newPath },
            removed   = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.DELETE) => x.oldPath },
            modified  = diffs._1.collect { case x if(x.changeType != DiffEntry.ChangeType.ADD &&
              x.changeType != DiffEntry.ChangeType.DELETE) => x.newPath },
            author    = WebHookUser(
-              name  = commit.committer,
-              email = commit.mailAddress
+              name  = commit.committerName,
+              email = commit.committerEmailAddress
            )
          )
-        }.toList,
+        },
        WebHookRepository(
          name        = repositoryInfo.name,
          url         = repositoryInfo.httpUrl,
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -1,307 +1,278 @@
-package service
-
-import java.util.Date
-import org.eclipse.jgit.api.Git
-import org.apache.commons.io.FileUtils
-import util._
-import _root_.util.ControlUtil._
-import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
-import org.eclipse.jgit.lib._
-import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry}
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
-import java.io.ByteArrayInputStream
-import org.eclipse.jgit.patch._
-import org.eclipse.jgit.api.errors.PatchFormatException
-import scala.collection.JavaConverters._
-import scala.Some
-import service.RepositoryService.RepositoryInfo
-
-
-object WikiService {
-  
-  /**
-   * The model for wiki page.
-   * 
-   * @param name the page name
-   * @param content the page content
-   * @param committer the last committer
-   * @param time the last modified time
-   * @param id the latest commit id
-   */
-  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
-  
-  /**
-   * The model for wiki page history.
-   * 
-   * @param name the page name
-   * @param committer the committer the committer
-   * @param message the commit message
-   * @param date the commit date
-   */
-  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
-
-  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
-
-  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
-    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
-}
-
-trait WikiService {
-  import WikiService._
-
-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
-        if(!dir.exists){
-          JGitUtil.initRepository(dir)
-          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
-        }
-      }
-    }
-
-  /**
-   * Returns the wiki page.
-   */
-  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
-        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
-          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
-                       file.committer, file.time, file.commitId)
-        }
-      } else None
-    }
-  }
-
-  /**
-   * Returns the content of the specified file.
-   */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
-        val index = path.lastIndexOf('/')
-        val parentPath = if(index < 0) "."  else path.substring(0, index)
-        val fileName   = if(index < 0) path else path.substring(index + 1)
-
-        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
-          git.getRepository.open(file.id).getBytes
-        }
-      } else None
-    }
-
-  /**
-   * Returns the list of wiki page names.
-   */
-  def getWikiPageList(owner: String, repository: String): List[String] = {
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      JGitUtil.getFileList(git, "master", ".")
-        .filter(_.name.endsWith(".md"))
-        .map(_.name.replaceFirst("\\.md$", ""))
-        .sortBy(x => x)
-    }
-  }
-
-  /**
-   * Reverts specified changes.
-   */
-  def revertWikiPage(owner: String, repository: String, from: String, to: String,
-                     committer: model.Account, pageName: Option[String]): Boolean = {
-
-    case class RevertInfo(operation: String, filePath: String, source: String)
-
-    try {
-      LockUtil.lock(s"${owner}/${repository}/wiki"){
-        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-
-          val reader = git.getRepository.newObjectReader
-          val oldTreeIter = new CanonicalTreeParser
-          oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
-
-          val newTreeIter = new CanonicalTreeParser
-          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
-
-          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
-            pageName match {
-              case Some(x) => diff.getNewPath == x + ".md"
-              case None    => true
-            }
-          }
-
-          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
-            val formatter = new DiffFormatter(out)
-            formatter.setRepository(git.getRepository)
-            formatter.format(diffs.asJava)
-            new String(out.toByteArray, "UTF-8")
-          }
-
-          val p = new Patch()
-          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
-          if(!p.getErrors.isEmpty){
-            throw new PatchFormatException(p.getErrors())
-          }
-          val revertInfo = (p.getFiles.asScala.map { fh =>
-            fh.getChangeType match {
-              case DiffEntry.ChangeType.MODIFY => {
-                val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("")
-                val applied = PatchUtil.apply(source, patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
-                } else Nil
-              }
-              case DiffEntry.ChangeType.ADD => {
-                val applied = PatchUtil.apply("", patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
-                } else Nil
-              }
-              case DiffEntry.ChangeType.DELETE => {
-                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
-              }
-              case DiffEntry.ChangeType.RENAME => {
-                val applied = PatchUtil.apply("", patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
-                } else {
-                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
-                }
-              }
-              case _ => Nil
-            }
-          }).flatten
-
-          if(revertInfo.nonEmpty){
-            val builder  = DirCache.newInCore.builder()
-            val inserter = git.getRepository.newObjectInserter()
-            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-
-            using(new RevWalk(git.getRepository)){ revWalk =>
-              using(new TreeWalk(git.getRepository)){ treeWalk =>
-                val index = treeWalk.addTree(revWalk.parseTree(headId))
-                treeWalk.setRecursive(true)
-                while(treeWalk.next){
-                  val path = treeWalk.getPathString
-                  val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                  if(revertInfo.find(x => x.filePath == path).isEmpty){
-                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                  }
-                }
-              }
-            }
-
-            revertInfo.filter(_.operation == "ADD").foreach { x =>
-              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
-            }
-            builder.finish()
-
-            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
-              pageName match {
-                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
-                case None    => s"Revert ${from} ... ${to}"
-              })
-          }
-        }
-      }
-      true
-    } catch {
-      case e: Exception => {
-        e.printStackTrace()
-        false
-      }
-    }
-  }
-
-  /**
-   * Save the wiki page.
-   */
-  def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
-      content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-        var created  = true
-        var updated  = false
-        var removed  = false
-
-        if(headId != null){
-          using(new RevWalk(git.getRepository)){ revWalk =>
-            using(new TreeWalk(git.getRepository)){ treeWalk =>
-              val index = treeWalk.addTree(revWalk.parseTree(headId))
-              treeWalk.setRecursive(true)
-              while(treeWalk.next){
-                val path = treeWalk.getPathString
-                val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                if(path == currentPageName + ".md" && currentPageName != newPageName){
-                  removed = true
-                } else if(path != newPageName + ".md"){
-                  builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                } else {
-                  created = false
-                  updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
-                }
-              }
-            }
-          }
-        }
-
-        if(created || updated || removed){
-          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
-          builder.finish()
-          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
-            if(message.trim.length == 0) {
-              if(removed){
-                s"Rename ${currentPageName} to ${newPageName}"
-              } else if(created){
-                s"Created ${newPageName}"
-              } else {
-                s"Updated ${newPageName}"
-              }
-            } else {
-              message
-            })
-
-          Some(newHeadId)
-        } else None
-      }
-    }
-  }
-
-  /**
-   * Delete the wiki page.
-   */
-  def deleteWikiPage(owner: String, repository: String, pageName: String,
-                     committer: String, mailAddress: String, message: String): Unit = {
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-        var removed  = false
-
-        using(new RevWalk(git.getRepository)){ revWalk =>
-          using(new TreeWalk(git.getRepository)){ treeWalk =>
-            val index = treeWalk.addTree(revWalk.parseTree(headId))
-            treeWalk.setRecursive(true)
-            while(treeWalk.next){
-              val path = treeWalk.getPathString
-              val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-              if(path != pageName + ".md"){
-                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-              } else {
-                removed = true
-              }
-            }
-          }
-
-          if(removed){
-            builder.finish()
-            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
-          }
-        }
-      }
-    }
-  }
-
-}
+package service
+
+import java.util.Date
+import org.eclipse.jgit.api.Git
+import util._
+import _root_.util.ControlUtil._
+import org.eclipse.jgit.treewalk.CanonicalTreeParser
+import org.eclipse.jgit.lib._
+import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
+import java.io.ByteArrayInputStream
+import org.eclipse.jgit.patch._
+import org.eclipse.jgit.api.errors.PatchFormatException
+import scala.collection.JavaConverters._
+import service.RepositoryService.RepositoryInfo
+
+object WikiService {
+  
+  /**
+   * The model for wiki page.
+   * 
+   * @param name the page name
+   * @param content the page content
+   * @param committer the last committer
+   * @param time the last modified time
+   * @param id the latest commit id
+   */
+  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
+  
+  /**
+   * The model for wiki page history.
+   * 
+   * @param name the page name
+   * @param committer the committer the committer
+   * @param message the commit message
+   * @param date the commit date
+   */
+  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
+
+  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
+
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
+}
+
+trait WikiService {
+  import WikiService._
+
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
+        if(!dir.exists){
+          JGitUtil.initRepository(dir)
+          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
+        }
+      }
+    }
+
+  /**
+   * Returns the wiki page.
+   */
+  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      if(!JGitUtil.isEmpty(git)){
+        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
+          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
+                       file.author, file.time, file.commitId)
+        }
+      } else None
+    }
+  }
+
+  /**
+   * Returns the content of the specified file.
+   */
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      if(!JGitUtil.isEmpty(git)){
+        val index = path.lastIndexOf('/')
+        val parentPath = if(index < 0) "."  else path.substring(0, index)
+        val fileName   = if(index < 0) path else path.substring(index + 1)
+
+        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
+          git.getRepository.open(file.id).getBytes
+        }
+      } else None
+    }
+
+  /**
+   * Returns the list of wiki page names.
+   */
+  def getWikiPageList(owner: String, repository: String): List[String] = {
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      JGitUtil.getFileList(git, "master", ".")
+        .filter(_.name.endsWith(".md"))
+        .map(_.name.stripSuffix(".md"))
+        .sortBy(x => x)
+    }
+  }
+
+  /**
+   * Reverts specified changes.
+   */
+  def revertWikiPage(owner: String, repository: String, from: String, to: String,
+                     committer: model.Account, pageName: Option[String]): Boolean = {
+
+    case class RevertInfo(operation: String, filePath: String, source: String)
+
+    try {
+      LockUtil.lock(s"${owner}/${repository}/wiki"){
+        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+
+          val reader = git.getRepository.newObjectReader
+          val oldTreeIter = new CanonicalTreeParser
+          oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
+
+          val newTreeIter = new CanonicalTreeParser
+          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
+            pageName match {
+              case Some(x) => diff.getNewPath == x + ".md"
+              case None    => true
+            }
+          }
+
+          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
+            val formatter = new DiffFormatter(out)
+            formatter.setRepository(git.getRepository)
+            formatter.format(diffs.asJava)
+            new String(out.toByteArray, "UTF-8")
+          }
+
+          val p = new Patch()
+          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
+          if(!p.getErrors.isEmpty){
+            throw new PatchFormatException(p.getErrors())
+          }
+          val revertInfo = (p.getFiles.asScala.map { fh =>
+            fh.getChangeType match {
+              case DiffEntry.ChangeType.MODIFY => {
+                val source = getWikiPage(owner, repository, fh.getNewPath.stripSuffix(".md")).map(_.content).getOrElse("")
+                val applied = PatchUtil.apply(source, patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.ADD => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.DELETE => {
+                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
+              }
+              case DiffEntry.ChangeType.RENAME => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
+                } else {
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
+                }
+              }
+              case _ => Nil
+            }
+          }).flatten
+
+          if(revertInfo.nonEmpty){
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+
+            JGitUtil.processTree(git, headId){ (path, tree) =>
+              if(revertInfo.find(x => x.filePath == path).isEmpty){
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+              }
+            }
+
+            revertInfo.filter(_.operation == "ADD").foreach { x =>
+              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
+            }
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
+              pageName match {
+                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
+                case None    => s"Revert ${from} ... ${to}"
+              })
+          }
+        }
+      }
+      true
+    } catch {
+      case e: Exception => {
+        e.printStackTrace()
+        false
+      }
+    }
+  }
+
+  /**
+   * Save the wiki page.
+   */
+  def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
+      content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var created  = true
+        var updated  = false
+        var removed  = false
+
+        if(headId != null){
+          JGitUtil.processTree(git, headId){ (path, tree) =>
+            if(path == currentPageName + ".md" && currentPageName != newPageName){
+              removed = true
+            } else if(path != newPageName + ".md"){
+              builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+            } else {
+              created = false
+              updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
+            }
+          }
+        }
+
+        if(created || updated || removed){
+          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+          builder.finish()
+          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
+            if(message.trim.length == 0) {
+              if(removed){
+                s"Rename ${currentPageName} to ${newPageName}"
+              } else if(created){
+                s"Created ${newPageName}"
+              } else {
+                s"Updated ${newPageName}"
+              }
+            } else {
+              message
+            })
+
+          Some(newHeadId.getName)
+        } else None
+      }
+    }
+  }
+
+  /**
+   * Delete the wiki page.
+   */
+  def deleteWikiPage(owner: String, repository: String, pageName: String,
+                     committer: String, mailAddress: String, message: String): Unit = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var removed  = false
+
+        JGitUtil.processTree(git, headId){ (path, tree) =>
+          if(path != pageName + ".md"){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          } else {
+            removed = true
+          }
+        }
+        if(removed){
+          builder.finish()
+          JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
+        }
+      }
+    }
+  }
+
+}
--- a/src/main/scala/servlet/AutoUpdateListener.scala
+++ b/src/main/scala/servlet/AutoUpdateListener.scala
@@ -1,165 +1,211 @@
-package servlet
-
-import java.io.File
-import java.sql.{DriverManager, Connection}
-import org.apache.commons.io.FileUtils
-import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
-import org.apache.commons.io.IOUtils
-import org.slf4j.LoggerFactory
-import util.Directory._
-import util.ControlUtil._
-import org.eclipse.jgit.api.Git
-
-object AutoUpdate {
-  
-  /**
-   * Version of GitBucket
-   * 
-   * @param majorVersion the major version
-   * @param minorVersion the minor version
-   */
-  case class Version(majorVersion: Int, minorVersion: Int){
-    
-    private val logger = LoggerFactory.getLogger(classOf[servlet.AutoUpdate.Version])
-    
-    /**
-     * Execute update/MAJOR_MINOR.sql to update schema to this version.
-     * If corresponding SQL file does not exist, this method do nothing.
-     */
-    def update(conn: Connection): Unit = {
-      val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-
-      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
-        if(in != null){
-          val sql = IOUtils.toString(in, "UTF-8")
-          using(conn.createStatement()){ stmt =>
-            logger.debug(sqlPath + "=" + sql)
-            stmt.executeUpdate(sql)
-          }
-        }
-      }
-    }
-    
-    /**
-     * MAJOR.MINOR
-     */
-    val versionString = s"${majorVersion}.${minorVersion}"
-  }
-
-  /**
-   * The history of versions. A head of this sequence is the current BitBucket version.
-   */
-  val versions = Seq(
-    Version(1, 12),
-    Version(1, 11),
-    Version(1, 10),
-    Version(1, 9),
-    Version(1, 8),
-    Version(1, 7),
-    Version(1, 6),
-    Version(1, 5),
-    Version(1, 4),
-    new Version(1, 3){
-      override def update(conn: Connection): Unit = {
-        super.update(conn)
-        // Fix wiki repository configuration
-        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
-          while(rs.next){
-            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
-              defining(git.getRepository.getConfig){ config =>
-                if(!config.getBoolean("http", "receivepack", false)){
-                  config.setBoolean("http", null, "receivepack", true)
-                  config.save
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    Version(1, 2),
-    Version(1, 1),
-    Version(1, 0),
-    Version(0, 0)
-  )
-  
-  /**
-   * The head version of BitBucket.
-   */
-  val headVersion = versions.head
-  
-  /**
-   * The version file (GITBUCKET_HOME/version).
-   */
-  lazy val versionFile = new File(GitBucketHome, "version")
-  
-  /**
-   * Returns the current version from the version file.
-   */
-  def getCurrentVersion(): Version = {
-    if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
-        case Array(majorVersion, minorVersion) => {
-          versions.find { v => 
-            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
-          }.getOrElse(Version(0, 0))
-        }
-        case _ => Version(0, 0)
-      }
-    } else Version(0, 0)
-  }
-  
-}
-
-/**
- * Update database schema automatically in the context initializing.
- */
-class AutoUpdateListener extends ServletContextListener {
-  import AutoUpdate._
-  private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
-  
-  override def contextInitialized(event: ServletContextEvent): Unit = {
-    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
-    if(datadir != null){
-      System.setProperty("gitbucket.home", datadir)
-    }
-    org.h2.Driver.load()
-    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
-
-    logger.debug("Start schema update")
-    defining(getConnection(event.getServletContext)){ conn =>
-      try {
-        defining(getCurrentVersion()){ currentVersion =>
-          if(currentVersion == headVersion){
-            logger.debug("No update")
-          } else if(!versions.contains(currentVersion)){
-            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
-          } else {
-            versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
-            FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
-            conn.commit()
-            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
-          }
-        }
-      } catch {
-        case ex: Throwable => {
-          logger.error("Failed to schema update", ex)
-          ex.printStackTrace()
-          conn.rollback()
-        }
-      }
-    }
-    logger.debug("End schema update")
-  }
-
-  def contextDestroyed(sce: ServletContextEvent): Unit = {
-    // Nothing to do.
-  }
-
-  private def getConnection(servletContext: ServletContext): Connection =
-    DriverManager.getConnection(
-      servletContext.getInitParameter("db.url"),
-      servletContext.getInitParameter("db.user"),
-      servletContext.getInitParameter("db.password"))
-
-}
+package servlet
+
+import java.io.File
+import java.sql.{DriverManager, Connection}
+import org.apache.commons.io.FileUtils
+import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
+import org.apache.commons.io.IOUtils
+import org.slf4j.LoggerFactory
+import util.Directory._
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
+import util.Directory
+import plugin.PluginUpdateJob
+
+object AutoUpdate {
+  
+  /**
+   * Version of GitBucket
+   * 
+   * @param majorVersion the major version
+   * @param minorVersion the minor version
+   */
+  case class Version(majorVersion: Int, minorVersion: Int){
+    
+    private val logger = LoggerFactory.getLogger(classOf[servlet.AutoUpdate.Version])
+    
+    /**
+     * Execute update/MAJOR_MINOR.sql to update schema to this version.
+     * If corresponding SQL file does not exist, this method do nothing.
+     */
+    def update(conn: Connection): Unit = {
+      val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
+
+      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
+        if(in != null){
+          val sql = IOUtils.toString(in, "UTF-8")
+          using(conn.createStatement()){ stmt =>
+            logger.debug(sqlPath + "=" + sql)
+            stmt.executeUpdate(sql)
+          }
+        }
+      }
+    }
+    
+    /**
+     * MAJOR.MINOR
+     */
+    val versionString = s"${majorVersion}.${minorVersion}"
+  }
+
+  /**
+   * The history of versions. A head of this sequence is the current BitBucket version.
+   */
+  val versions = Seq(
+    new Version(2, 2),
+    new Version(2, 1),
+    new Version(2, 0){
+      override def update(conn: Connection): Unit = {
+        import eu.medsea.mimeutil.{MimeUtil2, MimeType}
+
+        val mimeUtil = new MimeUtil2()
+        mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
+
+        super.update(conn)
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
+              if(dir.exists && dir.isDirectory){
+                dir.listFiles.foreach { file =>
+                  if(file.getName.indexOf('.') < 0){
+                    val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
+                    if(mimeType.startsWith("image/")){
+                      file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 13),
+    Version(1, 12),
+    Version(1, 11),
+    Version(1, 10),
+    Version(1, 9),
+    Version(1, 8),
+    Version(1, 7),
+    Version(1, 6),
+    Version(1, 5),
+    Version(1, 4),
+    new Version(1, 3){
+      override def update(conn: Connection): Unit = {
+        super.update(conn)
+        // Fix wiki repository configuration
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
+              defining(git.getRepository.getConfig){ config =>
+                if(!config.getBoolean("http", "receivepack", false)){
+                  config.setBoolean("http", null, "receivepack", true)
+                  config.save
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 2),
+    Version(1, 1),
+    Version(1, 0),
+    Version(0, 0)
+  )
+  
+  /**
+   * The head version of BitBucket.
+   */
+  val headVersion = versions.head
+  
+  /**
+   * The version file (GITBUCKET_HOME/version).
+   */
+  lazy val versionFile = new File(GitBucketHome, "version")
+  
+  /**
+   * Returns the current version from the version file.
+   */
+  def getCurrentVersion(): Version = {
+    if(versionFile.exists){
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
+        case Array(majorVersion, minorVersion) => {
+          versions.find { v => 
+            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
+          }.getOrElse(Version(0, 0))
+        }
+        case _ => Version(0, 0)
+      }
+    } else Version(0, 0)
+  }
+  
+}
+
+/**
+ * Update database schema automatically in the context initializing.
+ */
+class AutoUpdateListener extends ServletContextListener {
+  import org.quartz.impl.StdSchedulerFactory
+  import org.quartz.JobBuilder._
+  import org.quartz.TriggerBuilder._
+  import org.quartz.SimpleScheduleBuilder._
+  import AutoUpdate._
+
+  private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
+  private val scheduler = StdSchedulerFactory.getDefaultScheduler
+  
+  override def contextInitialized(event: ServletContextEvent): Unit = {
+    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
+    if(datadir != null){
+      System.setProperty("gitbucket.home", datadir)
+    }
+    org.h2.Driver.load()
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
+
+    logger.debug("Start schema update")
+    defining(getConnection(event.getServletContext)){ conn =>
+      try {
+        defining(getCurrentVersion()){ currentVersion =>
+          if(currentVersion == headVersion){
+            logger.debug("No update")
+          } else if(!versions.contains(currentVersion)){
+            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
+          } else {
+            versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
+            FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
+            conn.commit()
+            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
+          }
+        }
+      } catch {
+        case ex: Throwable => {
+          logger.error("Failed to schema update", ex)
+          ex.printStackTrace()
+          conn.rollback()
+        }
+      }
+    }
+    logger.debug("End schema update")
+
+    logger.debug("Starting plugin system...")
+    plugin.PluginSystem.init()
+
+    scheduler.start()
+    PluginUpdateJob.schedule(scheduler)
+    logger.debug("PluginUpdateJob is started.")
+
+    logger.debug("Plugin system is initialized.")
+  }
+
+  def contextDestroyed(sce: ServletContextEvent): Unit = {
+    scheduler.shutdown()
+  }
+
+  private def getConnection(servletContext: ServletContext): Connection =
+    DriverManager.getConnection(
+      servletContext.getInitParameter("db.url"),
+      servletContext.getInitParameter("db.user"),
+      servletContext.getInitParameter("db.password"))
+
+}
--- a/src/main/scala/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/servlet/BasicAuthenticationFilter.scala
@@ -3,6 +3,7 @@ package servlet
 import javax.servlet._
 import javax.servlet.http._
 import service.{SystemSettingsService, AccountService, RepositoryService}
+import model._
 import org.slf4j.LoggerFactory
 import util.Implicits._
 import util.ControlUtil._
@@ -20,7 +21,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
  def destroy(): Unit = {}
  
  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    val request  = req.asInstanceOf[HttpServletRequest]
+    implicit val request  = req.asInstanceOf[HttpServletRequest]
    val response = res.asInstanceOf[HttpServletResponse]

    val wrappedResponse = new HttpServletResponseWrapper(response){
@@ -38,9 +39,12 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
              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(Keys.Request.UserName, username)
-                    chain.doFilter(req, wrappedResponse)
+                  case Array(username, password) => getWritableUser(username, password, repository) match {
+                    case Some(account) => {
+                      request.setAttribute(Keys.Request.UserName, account.userName)
+                      chain.doFilter(req, wrappedResponse)
+                    }
+                    case None => requireAuth(response)
                  }
                  case _ => requireAuth(response)
                }
@@ -61,10 +65,11 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
    }
  }

-  private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean =
+  private def getWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo)
+                             (implicit session: Session): Option[Account] =
    authenticate(loadSystemSettings(), username, password) match {
-      case Some(account) => hasWritePermission(repository.owner, repository.name, Some(account))
-      case None => false
+      case x @ Some(account) if(hasWritePermission(repository.owner, repository.name, x)) => x
+      case _ => None
    }

  private def requireAuth(response: HttpServletResponse): Unit = {
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -16,6 +16,8 @@ import service._
 import WebHookService._
 import org.eclipse.jgit.api.Git
 import util.JGitUtil.CommitInfo
+import service.IssuesService.IssueSearchCondition
+import model.Session

 /**
 * Provides Git repository via HTTP.
@@ -63,7 +65,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
 }

 class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {
-  
+
  private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])

  override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
@@ -75,12 +77,16 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

    defining(request.paths){ paths =>
      val owner      = paths(1)
-      val repository = paths(2).replaceFirst("\\.git$", "")
+      val repository = paths(2).stripSuffix(".git")

      logger.debug("repository:" + owner + "/" + repository)

      if(!repository.endsWith(".wiki")){
-        receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request)))
+        defining(request) { implicit r =>
+          val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
+          receivePack.setPreReceiveHook(hook)
+          receivePack.setPostReceiveHook(hook)
+        }
      }
      receivePack
    }
@@ -89,14 +95,30 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

 import scala.collection.JavaConverters._

-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: Session)
+  extends PostReceiveHook with PreReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
  
  private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
-  
+  private var existIds: Seq[String] = Nil
+
+  def onPreReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
+    try {
+      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        existIds = JGitUtil.getAllCommitIds(git)
+      }
+    } catch {
+      case ex: Exception => {
+        logger.error(ex.toString, ex)
+        throw ex
+      }
+    }
+  }
+
  def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
    try {
      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        val pushedIds = scala.collection.mutable.Set[String]()
        commands.asScala.foreach { command =>
          logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
          val refName = command.getRefName.split("/")
@@ -110,26 +132,26 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
            }
          }

-          // Extract new commit and apply issue comment
-          val newCommits = if(commits.size > 1000){
-            val existIds = getAllCommitIds(owner, repository)
-            commits.flatMap { commit =>
-              if(!existIds.contains(commit.id)){
-                createIssueComment(commit)
-                Some(commit)
-              } else None
-            }
-          } else {
-            commits.flatMap { commit =>
-              if(!existsCommitId(owner, repository, commit.id)){
-                createIssueComment(commit)
-                Some(commit)
-              } else None
-            }
-          }
+          // Retrieve all issue count in the repository
+          val issueCount =
+            countIssue(IssueSearchCondition(state = "open"), Map.empty, false, owner -> repository) +
+            countIssue(IssueSearchCondition(state = "closed"), Map.empty, false, owner -> repository)

-          // batch insert all new commit id
-          insertAllCommitIds(owner, repository, newCommits.map(_.id))
+          // Extract new commit and apply issue comment
+          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
+          val newCommits = commits.flatMap { commit =>
+            if (!existIds.contains(commit.id) && !pushedIds.contains(commit.id)) {
+              if (issueCount > 0) {
+                pushedIds.add(commit.id)
+                createIssueComment(commit)
+                // close issues
+                if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+                  closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository)
+                }
+              }
+              Some(commit)
+            } else None
+          }

          // record activity
          if(refName(1) == "heads"){
@@ -157,14 +179,6 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
            }
          }

-          // close issues
-          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
-          if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
-            git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
-              closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
-            }
-          }
-
          // call web hook
          getWebHookURLs(owner, repository) match {
            case webHookURLs if(webHookURLs.nonEmpty) =>
@@ -191,7 +205,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
  private def createIssueComment(commit: CommitInfo) = {
    StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
      if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
        }
      }
@@ -204,14 +218,18 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
  private def updatePullRequests(branch: String) =
    getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
      if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){
-        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git =>
-          git.fetch
+        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName)),
+              Git.open(Directory.getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))){ (oldGit, newGit) =>
+          oldGit.fetch
            .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString)
            .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/pull/${pullreq.issueId}/head").setForceUpdate(true))
            .call

-          val commitIdTo = git.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
-          updateCommitIdTo(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo)
+          val commitIdTo = oldGit.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
+          val commitIdFrom = JGitUtil.getForkedCommitId(oldGit, newGit,
+            pullreq.userName, pullreq.repositoryName, pullreq.branch,
+            pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
+          updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
        }
      }
    }
--- a/src/main/scala/servlet/PluginActionInvokeFilter.scala
+++ b/src/main/scala/servlet/PluginActionInvokeFilter.scala
@@ -0,0 +1,104 @@
+package servlet
+
+import javax.servlet._
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import org.apache.commons.io.IOUtils
+import twirl.api.Html
+import service.{AccountService, RepositoryService, SystemSettingsService}
+import model.{Account, Session}
+import util.{JGitUtil, Keys}
+import plugin.PluginConnectionHolder
+import service.RepositoryService.RepositoryInfo
+import service.SystemSettingsService.SystemSettings
+
+class PluginActionInvokeFilter extends Filter with SystemSettingsService with RepositoryService with AccountService {
+
+  def init(config: FilterConfig) = {}
+
+  def destroy(): Unit = {}
+
+  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
+    (req, res) match {
+      case (request: HttpServletRequest, response: HttpServletResponse) => {
+        Database(req.getServletContext) withTransaction { implicit session =>
+          val path = req.asInstanceOf[HttpServletRequest].getRequestURI
+          if(!processGlobalAction(path, request, response) && !processRepositoryAction(path, request, response)){
+            chain.doFilter(req, res)
+          }
+        }
+      }
+    }
+  }
+
+  private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse): Boolean = {
+    plugin.PluginSystem.globalActions.find(_.path == path).map { action =>
+      val result = action.function(request, response)
+      val systemSettings = loadSystemSettings()
+      result match {
+        case x: String => renderGlobalHtml(request, response, systemSettings, x)
+        case x: org.mozilla.javascript.NativeObject => {
+          x.get("format") match {
+            case "html" => renderGlobalHtml(request, response, systemSettings, x.get("body").toString)
+            case "json" => renderJson(request, response, x.get("body").toString)
+          }
+        }
+      }
+      true
+    } getOrElse false
+  }
+
+  private def processRepositoryAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
+                                     (implicit session: Session): Boolean = {
+    val elements = path.split("/")
+    if(elements.length > 3){
+      val owner  = elements(1)
+      val name   = elements(2)
+      val remain = elements.drop(3).mkString("/", "/", "")
+      val systemSettings = loadSystemSettings()
+      getRepository(owner, name, systemSettings.baseUrl(request)).flatMap { repository =>
+        plugin.PluginSystem.repositoryActions.find(_.path == remain).map { action =>
+          val result = try {
+            PluginConnectionHolder.threadLocal.set(session.conn)
+            action.function(request, response, repository)
+          } finally {
+            PluginConnectionHolder.threadLocal.remove()
+          }
+          result match {
+            case x: String => renderRepositoryHtml(request, response, systemSettings, repository, x)
+            case x: org.mozilla.javascript.NativeObject => {
+              x.get("format") match {
+                case "html" => renderRepositoryHtml(request, response, systemSettings, repository, x.get("body").toString)
+                case "json" => renderJson(request, response, x.get("body").toString)
+              }
+            }
+          }
+          true
+        }
+      } getOrElse false
+    } else false
+  }
+
+  private def renderGlobalHtml(request: HttpServletRequest, response: HttpServletResponse,
+                               systemSettings: SystemSettings, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+    implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+    val html = _root_.html.main("GitBucket", None)(Html(body))
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderRepositoryHtml(request: HttpServletRequest, response: HttpServletResponse,
+                                   systemSettings: SystemSettings, repository: RepositoryInfo, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+    implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+    val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(body))) // TODO specify active side menu
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderJson(request: HttpServletRequest, response: HttpServletResponse, body: String): Unit = {
+    response.setContentType("application/json; charset=UTF-8")
+    IOUtils.write(body.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+}
--- a/src/main/scala/servlet/SessionCleanupListener.scala
+++ b/src/main/scala/servlet/SessionCleanupListener.scala
@@ -1,15 +1,16 @@
 package servlet

 import javax.servlet.http.{HttpSessionEvent, HttpSessionListener}
-import app.FileUploadControllerBase
+import org.apache.commons.io.FileUtils
+import util.Directory._

 /**
 * Removes session associated temporary files when session is destroyed.
 */
-class SessionCleanupListener extends HttpSessionListener with FileUploadControllerBase {
+class SessionCleanupListener extends HttpSessionListener {

  def sessionCreated(se: HttpSessionEvent): Unit = {}

-  def sessionDestroyed(se: HttpSessionEvent): Unit = removeTemporaryFiles()(se.getSession)
+  def sessionDestroyed(se: HttpSessionEvent): Unit = FileUtils.deleteDirectory(getTemporaryDir(se.getSession.getId))

 }
--- a/src/main/scala/servlet/TransactionFilter.scala
+++ b/src/main/scala/servlet/TransactionFilter.scala
@@ -1,38 +1,45 @@
-package servlet
-
-import javax.servlet._
-import org.slf4j.LoggerFactory
-import javax.servlet.http.HttpServletRequest
-
-/**
- * Controls the transaction with the open session in view pattern.
- */
-class TransactionFilter extends Filter {
-  
-  private val logger = LoggerFactory.getLogger(classOf[TransactionFilter])
-  
-  def init(config: FilterConfig) = {}
-  
-  def destroy(): Unit = {}
-  
-  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    if(req.asInstanceOf[HttpServletRequest].getRequestURI().startsWith("/assets/")){
-      // assets don't need transaction
-      chain.doFilter(req, res)
-    } else {
-      Database(req.getServletContext) withTransaction {
-        logger.debug("begin transaction")
-        chain.doFilter(req, res)
-        logger.debug("end transaction")
-      }
-    }
-  }
-
-}
-
-object Database {
-  def apply(context: ServletContext): scala.slick.session.Database =
-    scala.slick.session.Database.forURL(context.getInitParameter("db.url"),
-        context.getInitParameter("db.user"),
-        context.getInitParameter("db.password"))
-}
+package servlet
+
+import javax.servlet._
+import org.slf4j.LoggerFactory
+import javax.servlet.http.HttpServletRequest
+import util.Keys
+
+/**
+ * Controls the transaction with the open session in view pattern.
+ */
+class TransactionFilter extends Filter {
+  
+  private val logger = LoggerFactory.getLogger(classOf[TransactionFilter])
+  
+  def init(config: FilterConfig) = {}
+  
+  def destroy(): Unit = {}
+  
+  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
+    if(req.asInstanceOf[HttpServletRequest].getRequestURI().startsWith("/assets/")){
+      // assets don't need transaction
+      chain.doFilter(req, res)
+    } else {
+      Database(req.getServletContext) withTransaction { session =>
+        logger.debug("begin transaction")
+        req.setAttribute(Keys.Request.DBSession, session)
+        chain.doFilter(req, res)
+        logger.debug("end transaction")
+      }
+    }
+  }
+
+}
+
+object Database {
+
+  def apply(context: ServletContext): slick.jdbc.JdbcBackend.Database =
+    slick.jdbc.JdbcBackend.Database.forURL(context.getInitParameter("db.url"),
+        context.getInitParameter("db.user"),
+        context.getInitParameter("db.password"))
+
+  def getSession(req: ServletRequest): slick.jdbc.JdbcBackend#Session =
+    req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
+
+}
--- a/src/main/scala/ssh/GitCommand.scala
+++ b/src/main/scala/ssh/GitCommand.scala
@@ -12,7 +12,7 @@ import servlet.{Database, CommitLogHook}
 import service.{AccountService, RepositoryService, SystemSettingsService}
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 import javax.servlet.ServletContext
-
+import model.Session

 object GitCommand {
  val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
@@ -27,11 +27,11 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
  protected var out: OutputStream = null
  protected var callback: ExitCallback = null

-  protected def runTask(user: String): Unit
+  protected def runTask(user: String)(implicit session: Session): Unit

  private def newTask(user: String): Runnable = new Runnable {
    override def run(): Unit = {
-      Database(context) withTransaction {
+      Database(context) withSession { implicit session =>
        try {
          runTask(user)
          callback.onExit(0)
@@ -71,7 +71,8 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
    this.in = in
  }

-  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo): Boolean =
+  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo)
+                              (implicit session: Session): Boolean =
    getAccountByUserName(username) match {
      case Some(account) => hasWritePermission(repositoryInfo.owner, repositoryInfo.name, Some(account))
      case None => false
@@ -82,7 +83,7 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
 class GitUploadPack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
    with RepositoryService with AccountService {

-  override protected def runTask(user: String): Unit = {
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
      if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
@@ -99,14 +100,16 @@ class GitUploadPack(context: ServletContext, owner: String, repoName: String, ba
 class GitReceivePack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
    with SystemSettingsService with RepositoryService with AccountService {

-  override protected def runTask(user: String): Unit = {
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
      if(isWritableUser(user, repositoryInfo)){
        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
          val repository = git.getRepository
          val receive = new ReceivePack(repository)
          if(!repoName.endsWith(".wiki")){
-            receive.setPostReceiveHook(new CommitLogHook(owner, repoName, user, baseUrl))
+            val hook = new CommitLogHook(owner, repoName, user, baseUrl)
+            receive.setPreReceiveHook(hook)
+            receive.setPostReceiveHook(hook)
          }
          receive.receive(in, out, err)
        }
--- a/src/main/scala/ssh/PublicKeyAuthenticator.scala
+++ b/src/main/scala/ssh/PublicKeyAuthenticator.scala
@@ -10,7 +10,7 @@ import javax.servlet.ServletContext
 class PublicKeyAuthenticator(context: ServletContext) extends PublickeyAuthenticator with SshKeyService {

  override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
-    Database(context) withTransaction {
+    Database(context) withSession { implicit session =>
      getPublicKeys(username).exists { sshKey =>
        SshUtil.str2PublicKey(sshKey.publicKey) match {
          case Some(publicKey) => key.equals(publicKey)
--- a/src/main/scala/ssh/SshServerListener.scala
+++ b/src/main/scala/ssh/SshServerListener.scala
@@ -31,6 +31,7 @@ object SshServer {
  def stop() = {
    if(active.compareAndSet(true, false)){
      server.stop(true)
+      logger.info("SSH Server is stopped.")
    }
  }

@@ -45,16 +46,17 @@ object SshServer {
 */
 class SshServerListener extends ServletContextListener with SystemSettingsService {

+  private val logger = LoggerFactory.getLogger(classOf[SshServerListener])
+
  override def contextInitialized(sce: ServletContextEvent): Unit = {
    val settings = loadSystemSettings()
    if(settings.ssh){
-      if(settings.baseUrl.isEmpty){
-        // TODO use logger?
-        println("Could not start SshServer because the baseUrl is not configured.")
-      } else {
-        SshServer.start(sce.getServletContext,
-          settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
-          settings.baseUrl.get)
+      settings.baseUrl match {
+        case None =>
+          logger.error("Could not start SshServer because the baseUrl is not configured.")
+        case Some(baseUrl) =>
+          SshServer.start(sce.getServletContext,
+            settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), baseUrl)
      }
    }
  }
--- a/src/main/scala/ssh/SshUtil.scala
+++ b/src/main/scala/ssh/SshUtil.scala
@@ -14,7 +14,7 @@ object SshUtil {
    // TODO RFC 4716 Public Key is not supported...
    val parts = key.split(" ")
    if (parts.size < 2) {
-      logger.debug(s"Invalid PublicKey Format: key")
+      logger.debug(s"Invalid PublicKey Format: ${key}")
      return None
    }
    try {
@@ -28,6 +28,9 @@ object SshUtil {
    }
  }

-  def fingerPrint(key: String): String = KeyUtils.getFingerPrint(str2PublicKey(key).get)
+  def fingerPrint(key: String): Option[String] = str2PublicKey(key) match {
+    case Some(publicKey) => Some(KeyUtils.getFingerPrint(publicKey))
+    case None => None
+  }

 }
--- a/src/main/scala/util/ControlUtil.scala
+++ b/src/main/scala/util/ControlUtil.scala
@@ -37,15 +37,4 @@ object ControlUtil {
  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
    try f(treeWalk) finally treeWalk.release()

-
-//  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
-//    try {
-//      f(ref)
-//    } finally {
-//      val refUpdate = git.getRepository.updateRef(ref.getDestination)
-//      refUpdate.setForceUpdate(true)
-//      refUpdate.delete()
-//    }
-//  }
-
 }
--- a/src/main/scala/util/Directory.scala
+++ b/src/main/scala/util/Directory.scala
@@ -29,24 +29,14 @@ object Directory {
  }).getAbsolutePath

  val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
-  
+
  val RepositoryHome = s"${GitBucketHome}/repositories"

  val DatabaseHome = s"${GitBucketHome}/data"
-  
-  /**
-   * Repository names of the specified user.
-   */
-  def getRepositories(owner: String): List[String] =
-    defining(new File(s"${RepositoryHome}/${owner}")){ dir =>
-      if(dir.exists){
-        dir.listFiles.filter { file =>
-          file.isDirectory && !file.getName.endsWith(".wiki.git")
-        }.map(_.getName.replaceFirst("\\.git$", "")).toList
-      } else {
-        Nil
-      }
-    }
+
+  val PluginHome = s"${GitBucketHome}/plugins"
+
+  val TemporaryHome = s"${GitBucketHome}/tmp"

  /**
   * Substance directory of the repository.
@@ -54,16 +44,33 @@ object Directory {
  def getRepositoryDir(owner: String, repository: String): File =
    new File(s"${RepositoryHome}/${owner}/${repository}.git")

+  /**
+   * Directory for files which are attached to issue.
+   */
+  def getAttachedDir(owner: String, repository: String): File =
+    new File(s"${RepositoryHome}/${owner}/${repository}/issues")
+
  /**
   * 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 upload file.
+   */
+  def getTemporaryDir(sessionId: String): File =
+    new File(s"${TemporaryHome}/_upload/${sessionId}")
+
  /**
   * Root of temporary directories for the specified repository.
   */
  def getTemporaryDir(owner: String, repository: String): File =
-    new File(s"${GitBucketHome}/tmp/${owner}/${repository}")
+    new File(s"${TemporaryHome}/${owner}/${repository}")
+
+  /**
+   * Root of plugin cache directory. Plugin repositories are cloned into this directory.
+   */
+  def getPluginCacheDir(): File = new File(s"${TemporaryHome}/_plugins")

  /**
   * Temporary directory which is used to create an archive to download repository contents.
--- a/src/main/scala/util/FileUtil.scala
+++ b/src/main/scala/util/FileUtil.scala
@@ -4,9 +4,10 @@ import org.apache.commons.io.FileUtils
 import java.net.URLConnection
 import java.io.File
 import util.ControlUtil._
+import scala.util.Random

 object FileUtil {
-  
+
  def getMimeType(name: String): String =
    defining(URLConnection.getFileNameMap()){ fileNameMap =>
      fileNameMap.getContentTypeFor(name) match {
@@ -26,32 +27,12 @@ object FileUtil {
  }

  def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
-  
+
  def isLarge(size: Long): Boolean = (size > 1024 * 1000)
-  
+
  def isText(content: Array[Byte]): Boolean = !content.contains(0)

-//  def createZipFile(dest: File, dir: File): Unit = {
-//    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
-//      dir.listFiles.map { file =>
-//        if(file.isFile){
-//          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
-//          out.write(FileUtils.readFileToByteArray(file))
-//          out.closeArchiveEntry
-//        } else if(file.isDirectory){
-//          addDirectoryToZip(out, file, path + "/" + file.getName)
-//        }
-//      }
-//    }
-//
-//    using(new ZipArchiveOutputStream(dest)){ out =>
-//      addDirectoryToZip(out, dir, dir.getName)
-//    }
-//  }
-
-  def getFileName(path: String): String = defining(path.lastIndexOf('/')){ i =>
-    if(i >= 0) path.substring(i + 1) else path
-  }
+  def generateFileId: String = System.currentTimeMillis + Random.alphanumeric.take(10).mkString

  def getExtension(name: String): String =
    name.lastIndexOf('.') match {
--- a/src/main/scala/util/Implicits.scala
+++ b/src/main/scala/util/Implicits.scala
@@ -2,6 +2,8 @@ package util

 import scala.util.matching.Regex
 import scala.util.control.Exception._
+import slick.jdbc.JdbcBackend
+import servlet.Database
 import javax.servlet.http.{HttpSession, HttpServletRequest}

 /**
@@ -9,6 +11,9 @@ import javax.servlet.http.{HttpSession, HttpServletRequest}
 */
 object Implicits {

+  // Convert to slick session.
+  implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
+
  implicit class RichSeq[A](seq: Seq[A]) {

    def splitWith(condition: (A, A) => Boolean): Seq[Seq[A]] = split(seq)(condition)
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -35,7 +35,11 @@ object JGitUtil {
   * @param branchList the list of branch names
   * @param tags the list of tags
   */
-  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo])
+  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo]){
+    def this(owner: String, name: String, baseUrl: String) = {
+      this(owner, name, s"${baseUrl}/git/${owner}/${name}.git", 0, Nil, Nil)
+    }
+  }

  /**
   * The file data for the file list of the repository viewer.
@@ -43,38 +47,45 @@ object JGitUtil {
   * @param id the object id
   * @param isDirectory whether is it directory
   * @param name the file (or directory) name
-   * @param time the last modified time
   * @param message the last commit message
   * @param commitId the last commit id
-   * @param committer the last committer name
+   * @param time the last modified time
+   * @param author the last committer name
   * @param mailAddress the committer's mail address
   * @param linkUrl the url of submodule
   */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
-                      committer: String, mailAddress: String, linkUrl: Option[String])
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, message: String, commitId: String,
+                      time: Date, author: String, mailAddress: String, linkUrl: Option[String])

  /**
   * The commit data.
   *
   * @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
+   * @param authorTime the author time
+   * @param authorName the author name
+   * @param authorEmailAddress the mail address of the author
+   * @param commitTime the commit time
+   * @param committerName  the committer name
+   * @param committerEmailAddress the mail address of the committer
   */
-  case class CommitInfo(id: String, time: Date, committer: String, mailAddress: String,
-                        shortMessage: String, fullMessage: String, parents: List[String]){
+  case class CommitInfo(id: String, shortMessage: String, fullMessage: String, parents: List[String],
+                        authorTime: Date, authorName: String, authorEmailAddress: String,
+                        commitTime: Date, committerName: String, committerEmailAddress: String){
    
    def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
        rev.getName,
-        rev.getCommitterIdent.getWhen,
-        rev.getCommitterIdent.getName,
-        rev.getCommitterIdent.getEmailAddress,
        rev.getShortMessage,
        rev.getFullMessage,
-        rev.getParents().map(_.name).toList)
+        rev.getParents().map(_.name).toList,
+        rev.getAuthorIdent.getWhen,
+        rev.getAuthorIdent.getName,
+        rev.getAuthorIdent.getEmailAddress,
+        rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress)

    val summary = getSummaryMessage(fullMessage, shortMessage)

@@ -83,6 +94,8 @@ object JGitUtil {
        Some(fullMessage.trim.substring(i).trim)
      } else None
    }
+
+    def isDifferentFromAuthor: Boolean = authorName != committerName || authorEmailAddress != committerEmailAddress
  }

  case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -92,8 +105,14 @@ object JGitUtil {
   *
   * @param viewType "image", "large" or "other"
   * @param content the string content
+   * @param charset the character encoding
   */
-  case class ContentInfo(viewType: String, content: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String]){
+    /**
+     * the line separator of this content ("LF" or "CRLF")
+     */
+    val lineSeparator: String = if(content.exists(_.indexOf("\r\n") >= 0)) "CRLF" else "LF"
+  }

  /**
   * The tag data.
@@ -137,7 +156,7 @@ object JGitUtil {
    using(Git.open(getRepositoryDir(owner, repository))){ git =>
      try {
        // get commit count
-        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum
+        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10001).sum

        RepositoryInfo(
          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
@@ -145,12 +164,12 @@ object JGitUtil {
          commitCount,
          // branches
          git.branchList.call.asScala.map { ref =>
-            ref.getName.replaceFirst("^refs/heads/", "")
+            ref.getName.stripPrefix("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)
+            TagInfo(ref.getName.stripPrefix("refs/tags/"), revCommit.getCommitterIdent.getWhen, revCommit.getName)
          }.toList
        )
      } catch {
@@ -189,7 +208,7 @@ object JGitUtil {
              val targetPath = walker.getPathString
              if((path + "/").startsWith(targetPath)){
                true
-              } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
+              } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf('/') < 0){
                stopRecursive = true
                treeWalk.setRecursive(false)
                true
@@ -221,11 +240,11 @@ object JGitUtil {
          objectId,
          fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
          name,
-          commit.getCommitterIdent.getWhen,
          getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
          commit.getName,
-          commit.getCommitterIdent.getName,
-          commit.getCommitterIdent.getEmailAddress,
+          commit.getAuthorIdent.getWhen,
+          commit.getAuthorIdent.getName,
+          commit.getAuthorIdent.getEmailAddress,
          linkUrl)
      }
    }.sortWith { (file1, file2) =>
@@ -371,7 +390,12 @@ object JGitUtil {

      if(commits.length >= 2){
        // not initial commit
-        val oldCommit = commits(1)
+        val oldCommit = if(revCommit.getParentCount >= 2) {
+          // merge commit
+          revCommit.getParents.head
+        } else {
+          commits(1)
+        }
        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))

      } else {
@@ -480,7 +504,7 @@ object JGitUtil {
  }

  def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
-                              fullName: String, mailAddress: String, message: String): String = {
+                              fullName: String, mailAddress: String, message: String): ObjectId = {
    val newCommit = new CommitBuilder()
    newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
    newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -498,7 +522,7 @@ object JGitUtil {
    refUpdate.setNewObjectId(newHeadId)
    refUpdate.update()

-    newHeadId.getName
+    newHeadId
  }

  /**
@@ -549,6 +573,26 @@ object JGitUtil {
    }
  }

+  def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
+    // Viewer
+    val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
+    val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
+    val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
+
+    if(viewer == "other"){
+      if(bytes.isDefined && FileUtil.isText(bytes.get)){
+        // text
+        ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
+      } else {
+        // binary
+        ContentInfo("binary", None, None)
+      }
+    } else {
+      // image or large
+      ContentInfo(viewer, None, None)
+    }
+  }
+
  /**
   * Get object content of the given object id as byte array from the Git repository.
   *
@@ -570,4 +614,42 @@ object JGitUtil {
    case e: MissingObjectException => None
  }

+  /**
+   * Returns all commit id in the specified repository.
+   */
+  def getAllCommitIds(git: Git): Seq[String] = if(isEmpty(git)) {
+    Nil
+  } else {
+    val existIds = new scala.collection.mutable.ListBuffer[String]()
+    val i = git.log.all.call.iterator
+    while(i.hasNext){
+      existIds += i.next.name
+    }
+    existIds.toSeq
+  }
+
+  def processTree(git: Git, id: ObjectId)(f: (String, CanonicalTreeParser) => Unit) = {
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
+        val index = treeWalk.addTree(revWalk.parseTree(id))
+        treeWalk.setRecursive(true)
+        while(treeWalk.next){
+          f(treeWalk.getPathString, treeWalk.getTree(index, classOf[CanonicalTreeParser]))
+        }
+      }
+    }
+  }
+
+  /**
+   * Returns the identifier of the root commit (or latest merge commit) of the specified branch.
+   */
+  def getForkedCommitId(oldGit: Git, newGit: Git,
+                        userName: String, repositoryName: String, branch: String,
+                        requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
+    defining(getAllCommitIds(oldGit)){ existIds =>
+      getCommitLogs(newGit, requestBranch, true) { commit =>
+        existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+      }.head.id
+    }
+
 }
--- a/src/main/scala/util/Keys.scala
+++ b/src/main/scala/util/Keys.scala
@@ -61,6 +61,11 @@ object Keys {
   */
  object Request {

+    /**
+     * Request key for the Slick Session.
+     */
+    val DBSession = "DB_SESSION"
+
    /**
     * Request key for the Ajax request flag.
     */
--- a/src/main/scala/util/LDAPUtil.scala
+++ b/src/main/scala/util/LDAPUtil.scala
@@ -7,6 +7,7 @@ import java.security.Security
 import org.slf4j.LoggerFactory
 import service.SystemSettingsService.Ldap
 import scala.annotation.tailrec
+import model.Account

 /**
 * Utility for LDAP authentication.
@@ -16,6 +17,26 @@ object LDAPUtil {
  private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
  private val logger = LoggerFactory.getLogger(getClass().getName())

+  private val LDAP_DUMMY_MAL = "@ldap-devnull"
+
+  /**
+   * Returns true if mail address ends with "@ldap-devnull"
+   */
+  def isDummyMailAddress(account: Account): Boolean = {
+    account.mailAddress.endsWith(LDAP_DUMMY_MAL)
+  }
+
+  /**
+   * Creates dummy address (userName@ldap-devnull) for LDAP login.
+   *
+   * If  mail address is not managed in LDAP server, GitBucket stores this dummy address in first LDAP login.
+   * GitBucket does not send any mails to this dummy address. And these users must input their mail address
+   * at the first step after LDAP authentication.
+   */
+  def createDummyMailAddress(userName: String): String = {
+    userName + LDAP_DUMMY_MAL
+  }
+
  /**
   * Try authentication by LDAP using given configuration.
   * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
@@ -30,7 +51,7 @@ object LDAPUtil {
      keystore = ldapSettings.keystore.getOrElse(""),
      error    = "System LDAP authentication failed."
    ){ conn =>
-      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute, ldapSettings.additionalFilterCondition) match {
        case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
        case None         => Left("User does not exist.")
      }
@@ -47,18 +68,34 @@ object LDAPUtil {
      keystore = ldapSettings.keystore.getOrElse(""),
      error    = "User LDAP Authentication Failed."
    ){ conn =>
-      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
-        case Some(mailAddress) => Right(LDAPUserInfo(
+      if(ldapSettings.mailAttribute.getOrElse("").isEmpty) {
+        Right(LDAPUserInfo(
          userName    = userName,
          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
-            findFullName(conn, userDN, fullNameAttribute)
+            findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
          }.getOrElse(userName),
-          mailAddress = mailAddress))
-        case None => Left("Can't find mail address.")
+          mailAddress = createDummyMailAddress(userName)))
+      } else {
+        findMailAddress(conn, userDN, ldapSettings.userNameAttribute, userName, ldapSettings.mailAttribute.get) match {
+          case Some(mailAddress) => Right(LDAPUserInfo(
+            userName    = getUserNameFromMailAddress(userName),
+            fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+              findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
+            }.getOrElse(userName),
+            mailAddress = mailAddress))
+          case None => Left("Can't find mail address.")
+        }
      }
    }
  }

+  private def getUserNameFromMailAddress(userName: String): String = {
+    (userName.indexOf('@') match {
+      case i if i >= 0 => userName.substring(0, i)
+      case i           => userName
+    }).replaceAll("[^a-zA-Z0-9\\-_.]", "").replaceAll("^[_\\-]", "")
+  }
+
  private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String)
                  (f: LDAPConnection => Either[String, A]): Either[String, A] = {
    if (tls) {
@@ -105,7 +142,7 @@ object LDAPUtil {
  /**
   * Search a specified user and returns userDN if exists.
   */
-  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
+  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String, additionalFilterCondition: Option[String]): Option[String] = {
    @tailrec
    def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
      if(results.hasMore){
@@ -118,20 +155,26 @@ object LDAPUtil {
        entries.flatten
      }
    }
-    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, userNameAttribute + "=" + userName, null, false)).collectFirst {
+
+    val filterCond = additionalFilterCondition.getOrElse("") match {
+      case "" => userNameAttribute + "=" + userName
+      case x => "(&(" + x + ")(" + userNameAttribute + "=" + userName + "))"
+    }
+
+    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, filterCond, null, false)).collectFirst {
      case x => x.getDN
    }
  }

-  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
-    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
+  private def findMailAddress(conn: LDAPConnection, userDN: String, userNameAttribute: String, userName: String, mailAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, userNameAttribute + "=" + userName, Array[String](mailAttribute), false)){ results =>
      if(results.hasMore) {
        Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
      } else None
    }

-  private def findFullName(conn: LDAPConnection, userDN: String, nameAttribute: String): Option[String] =
-    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](nameAttribute), false)){ results =>
+  private def findFullName(conn: LDAPConnection, userDN: String, userNameAttribute: String, userName: String, nameAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, userNameAttribute + "=" + userName, Array[String](nameAttribute), false)){ results =>
      if(results.hasMore) {
        Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
      } else None
--- a/src/main/scala/util/Notifier.scala
+++ b/src/main/scala/util/Notifier.scala
@@ -1,116 +1,116 @@
-package util
-
-import scala.concurrent._
-import ExecutionContext.Implicits.global
-import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
-import org.slf4j.LoggerFactory
-
-import app.Context
-import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
-import servlet.Database
-import SystemSettingsService.Smtp
-import _root_.util.ControlUtil.defining
-
-trait Notifier extends RepositoryService with AccountService with IssuesService {
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context): Unit
-
-  protected def recipients(issue: model.Issue)(notify: String => Unit)(implicit context: Context) =
-    (
-        // individual repository's owner
-        issue.userName ::
-        // collaborators
-        getCollaborators(issue.userName, issue.repositoryName) :::
-        // participants
-        issue.openedUserName ::
-        getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
-    )
-    .distinct
-    .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
-    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) foreach (x => notify(x.mailAddress)) )
-
-}
-
-object Notifier {
-  // TODO We want to be able to switch to mock.
-  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
-    case settings if settings.notification => new Mailer(settings.smtp.get)
-    case _ => new MockMailer
-  }
-
-  def msgIssue(url: String) = (content: String) => s"""
-    |${content}<br/>
-    |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
-
-  def msgPullRequest(url: String) = (content: String) => s"""
-    |${content}<hr/>
-    |View, comment on, or merge it at:<br/>
-    |<a href="${url}">${url}</a>
-    """.stripMargin
-
-  def msgComment(url: String) = (content: String) => s"""
-    |${content}<br/>
-    |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
-
-  def msgStatus(url: String) = (content: String) => s"""
-    |${content} <a href="${url}">#${url split('/') last}</a>
-    """.stripMargin
-}
-
-class Mailer(private val smtp: Smtp) extends Notifier {
-  private val logger = LoggerFactory.getLogger(classOf[Mailer])
-
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context) = {
-    val database = Database(context.request.getServletContext)
-
-    val f = future {
-      // TODO Can we use the Database Session in other than Transaction Filter?
-      database withSession {
-        getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
-          defining(
-              s"[${r.name}] ${issue.title} (#${issueId})" ->
-              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
-            recipients(issue) { to =>
-              val email = new HtmlEmail
-              email.setHostName(smtp.host)
-              email.setSmtpPort(smtp.port.get)
-              smtp.user.foreach { user =>
-                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
-              }
-              smtp.ssl.foreach { ssl =>
-                email.setSSLOnConnect(ssl)
-              }
-              smtp.fromAddress
-                .map (_ -> smtp.fromName.orNull)
-                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
-                .foreach { case (address, name) =>
-                  email.setFrom(address, name)
-                }
-              email.setCharset("UTF-8")
-              email.setSubject(subject)
-              email.setHtmlMsg(msg)
-
-              email.addTo(to).send
-            }
-          }
-        }
-      }
-      "Notifications Successful."
-    }
-    f onSuccess {
-      case s => logger.debug(s)
-    }
-    f onFailure {
-      case t => logger.error("Notifications Failed.", t)
-    }
-  }
-}
-class MockMailer extends Notifier {
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context): Unit = {}
+package util
+
+import scala.concurrent._
+import ExecutionContext.Implicits.global
+import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
+import org.slf4j.LoggerFactory
+
+import app.Context
+import model.Session
+import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
+import servlet.Database
+import SystemSettingsService.Smtp
+import _root_.util.ControlUtil.defining
+
+trait Notifier extends RepositoryService with AccountService with IssuesService {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit
+
+  protected def recipients(issue: model.Issue)(notify: String => Unit)(implicit session: Session, context: Context) =
+    (
+        // individual repository's owner
+        issue.userName ::
+        // collaborators
+        getCollaborators(issue.userName, issue.repositoryName) :::
+        // participants
+        issue.openedUserName ::
+        getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
+    )
+    .distinct
+    .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
+    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) filterNot (LDAPUtil.isDummyMailAddress(_)) foreach (x => notify(x.mailAddress)) )
+
+}
+
+object Notifier {
+  // TODO We want to be able to switch to mock.
+  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
+    case settings if settings.notification => new Mailer(settings.smtp.get)
+    case _ => new MockMailer
+  }
+
+  def msgIssue(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgPullRequest(url: String) = (content: String) => s"""
+    |${content}<hr/>
+    |View, comment on, or merge it at:<br/>
+    |<a href="${url}">${url}</a>
+    """.stripMargin
+
+  def msgComment(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgStatus(url: String) = (content: String) => s"""
+    |${content} <a href="${url}">#${url split('/') last}</a>
+    """.stripMargin
+}
+
+class Mailer(private val smtp: Smtp) extends Notifier {
+  private val logger = LoggerFactory.getLogger(classOf[Mailer])
+
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context) = {
+    val database = Database(context.request.getServletContext)
+
+    val f = Future {
+      database withSession { implicit session =>
+        getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
+          defining(
+              s"[${r.name}] ${issue.title} (#${issueId})" ->
+              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
+            recipients(issue) { to =>
+              val email = new HtmlEmail
+              email.setHostName(smtp.host)
+              email.setSmtpPort(smtp.port.get)
+              smtp.user.foreach { user =>
+                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
+              }
+              smtp.ssl.foreach { ssl =>
+                email.setSSLOnConnect(ssl)
+              }
+              smtp.fromAddress
+                .map (_ -> smtp.fromName.orNull)
+                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
+                .foreach { case (address, name) =>
+                  email.setFrom(address, name)
+                }
+              email.setCharset("UTF-8")
+              email.setSubject(subject)
+              email.setHtmlMsg(msg)
+
+              email.addTo(to).send
+            }
+          }
+        }
+      }
+      "Notifications Successful."
+    }
+    f onSuccess {
+      case s => logger.debug(s)
+    }
+    f onFailure {
+      case t => logger.error("Notifications Failed.", t)
+    }
+  }
+}
+class MockMailer extends Notifier {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit = {}
 }
--- a/src/main/scala/util/StringUtil.scala
+++ b/src/main/scala/util/StringUtil.scala
@@ -46,6 +46,22 @@ object StringUtil {
      }
    }

+  /**
+   * Converts line separator in the given content.
+   *
+   * @param content the content
+   * @param lineSeparator "LF" or "CRLF"
+   * @return the converted content
+   */
+  def convertLineSeparator(content: String, lineSeparator: String): String = {
+    val lf = content.replace("\r\n", "\n").replace("\r", "\n")
+    if(lineSeparator == "CRLF"){
+      lf.replace("\n", "\r\n")
+    } else {
+      lf
+    }
+  }
+
  /**
   * Extract issue id like ```#issueId``` from the given message.
   *
--- a/src/main/scala/util/Validations.scala
+++ b/src/main/scala/util/Validations.scala
@@ -10,7 +10,7 @@ trait Validations {
   */
  def identifier: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("^[a-zA-Z0-9\\-_.]+$")){
+      if(!value.matches("[a-zA-Z0-9\\-_.]+")){
        Some(s"${name} contains invalid character.")
      } else if(value.startsWith("_") || value.startsWith("-")){
        Some(s"${name} starts with invalid character.")
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -17,7 +17,7 @@ trait AvatarImageProvider { self: RequestCache =>
      // by user name
      getAccountByUserName(userName).map { account =>
        if(account.image.isEmpty && context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
        }
@@ -28,13 +28,13 @@ trait AvatarImageProvider { self: RequestCache =>
      // by mail address
      getAccountByMailAddress(mailAddress).map { account =>
        if(account.image.isEmpty && context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
        }
      } getOrElse {
        if(context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/_unknown/_avatar"""
        }
@@ -42,9 +42,9 @@ trait AvatarImageProvider { self: RequestCache =>
    }

    if(tooltip){
-      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title="${userName}"/>""")
+      Html(s"""<img src="${src}" class="${if(size > 20){"avatar"} else {"avatar-mini"}}" 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;" />""")
+      Html(s"""<img src="${src}" class="${if(size > 20){"avatar"} else {"avatar-mini"}}" style="width: ${size}px; height: ${size}px;" />""")
    }
  }

--- a/src/main/scala/view/Markdown.scala
+++ b/src/main/scala/view/Markdown.scala
@@ -45,7 +45,7 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
          (text, text)
        }

-        val url = repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
+        val url = repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/" + StringUtil.urlEncode(page)

        if(getWikiPage(repository.owner, repository.name, page).isDefined){
          new Rendering(url, label)
@@ -89,7 +89,8 @@ class GitBucketHtmlSerializer(
  ) with LinkConverter with RequestCache {

  override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
-    printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
+    printer.print("<a target=\"_blank\" href=\"").print(fixUrl(url)).print("\">")
+           .print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/></a>")

  override protected def printLink(rendering: LinkRenderer.Rendering): Unit = {
    printer.print('<').print('a')
@@ -101,10 +102,10 @@ class GitBucketHtmlSerializer(
  }

  private def fixUrl(url: String): String = {
-    if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){
+    if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("#")){
      url
    } else {
-      repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
+      repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/_blob/" + url
    }
  }

--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -15,6 +15,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   */
  def datetime(date: Date): String = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)

+  /**
+   * Format java.util.Date to "yyyy-MM-dd'T'hh:mm:ss'Z'".
+   */
+  def datetimeRFC3339(date: Date): String = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'").format(date).replaceAll("(\\d\\d)(\\d\\d)$","$1:$2")
+
  /**
   * Format java.util.Date to "yyyy-MM-dd".
   */
@@ -27,6 +32,14 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  def plural(count: Int, singular: String, plural: String = ""): String =
    if(count == 1) singular else if(plural.isEmpty) singular + "s" else plural

+  private[this] val renderersBySuffix: Seq[(String, (List[String], String, String, service.RepositoryService.RepositoryInfo, Boolean, Boolean, app.Context) => Html)] =
+    Seq(
+      ".md" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
+      ".markdown" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context))
+    )
+
+  def renderableSuffixes: Seq[String] = renderersBySuffix.map(_._1)
+
  /**
   * Converts Markdown of Wiki pages to HTML.
   */
@@ -34,6 +47,21 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))

+  def renderMarkup(filePath: List[String], fileContent: String, branch: String,
+                   repository: service.RepositoryService.RepositoryInfo,
+                   enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+
+    val fileNameLower = filePath.reverse.head.toLowerCase
+    renderersBySuffix.find { case (suffix, _) => fileNameLower.endsWith(suffix) } match {
+      case Some((_, handler)) => handler(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context)
+      case None => Html(
+        s"<tt>${
+          fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
+        }</tt>"
+      )
+    }
+  }
+
  /**
   * Returns &lt;img&gt; which displays the avatar icon for the given user name.
   * This method looks up Gravatar if avatar icon has not been configured in user settings.
@@ -46,7 +74,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   * This method looks up Gravatar if avatar icon has not been configured in user settings.
   */
  def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
-    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+    getAvatarImageHtml(commit.authorName, size, commit.authorEmailAddress)

  /**
   * Converts commit id, issue id and username to the link.
@@ -135,6 +163,44 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   */
  def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime

+  /**
+   * Returns file type for AceEditor.
+   */
+  def editorType(fileName: String): String = {
+    fileName.toLowerCase match {
+      case x if(x.endsWith(".bat"))     => "batchfile"
+      case x if(x.endsWith(".java"))    => "java"
+      case x if(x.endsWith(".scala"))   => "scala"
+      case x if(x.endsWith(".js"))      => "javascript"
+      case x if(x.endsWith(".css"))     => "css"
+      case x if(x.endsWith(".md"))      => "markdown"
+      case x if(x.endsWith(".html"))    => "html"
+      case x if(x.endsWith(".xml"))     => "xml"
+      case x if(x.endsWith(".c"))       => "c_cpp"
+      case x if(x.endsWith(".cpp"))     => "c_cpp"
+      case x if(x.endsWith(".coffee"))  => "coffee"
+      case x if(x.endsWith(".ejs"))     => "ejs"
+      case x if(x.endsWith(".hs"))      => "haskell"
+      case x if(x.endsWith(".json"))    => "json"
+      case x if(x.endsWith(".jsp"))     => "jsp"
+      case x if(x.endsWith(".jsx"))     => "jsx"
+      case x if(x.endsWith(".cl"))      => "lisp"
+      case x if(x.endsWith(".clojure")) => "lisp"
+      case x if(x.endsWith(".lua"))     => "lua"
+      case x if(x.endsWith(".php"))     => "php"
+      case x if(x.endsWith(".py"))      => "python"
+      case x if(x.endsWith(".rdoc"))    => "rdoc"
+      case x if(x.endsWith(".rhtml"))   => "rhtml"
+      case x if(x.endsWith(".ruby"))    => "ruby"
+      case x if(x.endsWith(".sh"))      => "sh"
+      case x if(x.endsWith(".sql"))     => "sql"
+      case x if(x.endsWith(".tcl"))     => "tcl"
+      case x if(x.endsWith(".vbs"))     => "vbscript"
+      case x if(x.endsWith(".yml"))     => "yaml"
+      case _ => "plain_text"
+    }
+  }
+
  /**
   * Implicit conversion to add mkHtml() to Seq[Html].
   */
--- a/src/main/twirl/account/activity.scala.html
+++ b/src/main/twirl/account/activity.scala.html
@@ -2,5 +2,8 @@
@import context._
@import view.helpers._
@main(account, groupNames, "activity"){
+  <div class="pull-right">
+    <a href="@path/@{account.userName}.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
+  </div>
  @helper.html.activities(activities)
 }
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -1,61 +1,65 @@
@(account: model.Account, info: Option[Any])(implicit context: app.Context)
@import context._
@import view.helpers._
+@import util.LDAPUtil
@html.main("Edit your profile"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("profile", settings.ssh)
-  </div>
-  <div class="span9">
-    @helper.html.information(info)
-    <form action="@url(account.userName)/_edit" method="POST" validate="true">
-    <div class="box">
-      <div class="box-header">Profile</div>
-      <div class="box-content">
-        <div class="row-fluid">
-          <div class="span6">
-            @if(account.password.nonEmpty){
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("profile", settings.ssh)
+    </div>
+    <div class="span9">
+      @helper.html.information(info)
+      @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
+      <form action="@url(account.userName)/_edit" method="POST" validate="true">
+      <div class="box">
+        <div class="box-header">Profile</div>
+        <div class="box-content">
+          <div class="row-fluid">
+            <div class="span6">
+              @if(account.password.nonEmpty){
+                <fieldset>
+                  <label for="password" class="strong">
+                    Password (input to change password):
+                  </label>
+                  <input type="password" name="password" id="password" value=""/>
+                  <span id="error-password" class="error"></span>
+                </fieldset>
+              }
              <fieldset>
-                <label for="password" class="strong">
-                  Password (input to change password):
-                </label>
-                <input type="password" name="password" id="password" value=""/>
-                <span id="error-password" class="error"></span>
+                <label for="fullName" class="strong">Full Name:</label>
+                <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
+                <span id="error-fullName" class="error"></span>
              </fieldset>
-            }
-            <fieldset>
-              <label for="fullName" class="strong">Full Name:</label>
-              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
-              <span id="error-fullName" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="mailAddress" class="strong">Mail Address:</label>
-              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
-              <span id="error-mailAddress" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="url" class="strong">URL (optional):</label>
-              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
-              <span id="error-url" class="error"></span>
-            </fieldset>
+              <fieldset>
+                <label for="mailAddress" class="strong">Mail Address:</label>
+                <input type="text" name="mailAddress" id="mailAddress" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/>
+                <span id="error-mailAddress" class="error"></span>
+              </fieldset>
+              <fieldset>
+                <label for="url" class="strong">URL (optional):</label>
+                <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
+                <span id="error-url" class="error"></span>
+              </fieldset>
+            </div>
+            <div class="span6">
+              <fieldset>
+                <label for="avatar" class="strong">Image (optional):</label>
+                @helper.html.uploadavatar(Some(account))
+              </fieldset>
+            </div>
          </div>
-          <div class="span6">
-            <fieldset>
-              <label for="avatar" class="strong">Image (optional):</label>
-              @helper.html.uploadavatar(Some(account))
-            </fieldset>
+          <div style="margin-top: 20px;">
+            <div class="pull-right">
+              <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+            </div>
+            <input type="submit" class="btn btn-success" value="Save"/>
+            @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn">Cancel</a>}
          </div>
        </div>
-        <div style="margin-top: 20px;">
-          <div class="pull-right">
-            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-          </div>
-          <input type="submit" class="btn btn-success" value="Save"/>
-          <a href="@url(account.userName)" class="btn">Cancel</a>
-        </div>
      </div>
-    </div>
-  </form>
+    </form>
+  </div>
 </div>
 }
 <script>
@@ -64,4 +68,4 @@ $(function(){
    return confirm('Once you delete your account, there is no going back.\nAre you sure?');
  });
 });
-</script>
+</script>
--- a/src/main/twirl/account/group.scala.html
+++ b/src/main/twirl/account/group.scala.html
@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div>
+<div class="container">
  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
      <div class="row-fluid">
        <div class="span5">
@@ -60,7 +60,7 @@ $(function(){
  });

  $('#addMember').click(function(){
-    $('#error-memberName').text('');
+    $('#error-members').text('');
    var userName = $('#memberName').val();

    // check empty
@@ -73,18 +73,18 @@ $(function(){
      return $(this).data('name') == userName;
    }).length > 0;
    if(exists){
-      $('#error-memberName').text('User has been already added.');
+      $('#error-members').text('User has been already added.');
      return false;
    }

    // check existence
-    $.post('@path/admin/users/_usercheck', {
+    $.post('@path/_user/existence', {
      'userName': userName
    }, function(data, status){
      if(data == 'true'){
        addMemberHTML(userName, false);
      } else {
-        $('#error-memberName').text('User does not exist.');
+        $('#error-members').text('User does not exist.');
      }
    });
  });
--- a/src/main/twirl/account/main.scala.html
+++ b/src/main/twirl/account/main.scala.html
@@ -3,54 +3,56 @@
@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="account-fullname">@account.fullName</div>
-          <div class="account-username">@account.userName</div>
-        </div>
-        <div class="block">
-          @if(account.url.isDefined){
-            <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>
-        @if(groupNames.nonEmpty){
-          <div>
-            <div>Groups</div>
-            @groupNames.map { groupName =>
-              <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
-            }
+  <div class="container">
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span4">
+          <div class="block">
+            <div class="account-image">@avatar(account.userName, 270)</div>
+            <div class="account-fullname">@account.fullName</div>
+            <div class="account-username">@account.userName</div>
          </div>
-        }
+          <div class="block">
+            @if(account.url.isDefined){
+              <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>
+          @if(groupNames.nonEmpty){
+            <div>
+              <div>Groups</div>
+              @groupNames.map { groupName =>
+                <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
+              }
+            </div>
+          }

-      </div>
-      <div class="span8">
-        <ul class="nav nav-tabs">
-          <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
-          @if(account.isGroupAccount){
-            <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
-          } else {
-            <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>
-          }
-          @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
-            <li class="pull-right">
-              <div class="button-group">
-                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
-              </div>
-            </li>
-          }
-        </ul>
-        @body
+        </div>
+        <div class="span8">
+          <ul class="nav nav-tabs" style="margin-bottom: 5px;">
+            <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
+            @if(account.isGroupAccount){
+              <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
+            } else {
+              <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>
+            }
+            @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+              <li class="pull-right">
+                <div class="button-group">
+                  <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
+                </div>
+              </li>
+            }
+          </ul>
+          @body
+        </div>
      </div>
    </div>
  </div>
--- a/src/main/twirl/account/register.scala.html
+++ b/src/main/twirl/account/register.scala.html
@@ -2,6 +2,7 @@
@import context._
@import view.helpers._
@html.main("Create your account"){
+<div class="container">
  <h3>Create your account</h3>
  <form action="@path/register" method="POST" validate="true">
    <div class="row-fluid">
@@ -45,4 +46,5 @@
      <input type="submit" class="btn btn-success" value="Create account"/>
    </fieldset>
  </form>
+</div>
 }
--- a/src/main/twirl/account/repositories.scala.html
+++ b/src/main/twirl/account/repositories.scala.html
@@ -9,19 +9,24 @@
  } else {
    @repositories.map { repository =>
      <div class="block">
-        <div class="block-header">
-          <a href="@url(repository)">@repository.name</a>
-          @if(repository.repository.isPrivate){
-            <i class="icon-lock"></i>
-          }
+        <div class="repository-icon">
+          @helper.html.repositoryicon(repository, true)
+        </div>
+        <div class="repository-content">
+          <div class="block-header">
+            <a href="@url(repository)">@repository.name</a>
+            @if(repository.repository.isPrivate){
+              <i class="icon-lock"></i>
+            }
+          </div>
+          @if(repository.repository.originUserName.isDefined){
+            <div class="small muted">forked from <a href="@path/@repository.repository.parentUserName/@repository.repository.parentRepositoryName">@repository.repository.parentUserName/@repository.repository.parentRepositoryName</a></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>
-        @if(repository.repository.originUserName.isDefined){
-          <div class="small muted">forked from <a href="@path/@repository.repository.parentUserName/@repository.repository.parentRepositoryName">@repository.repository.parentUserName/@repository.repository.parentRepositoryName</a></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>
    }
  }
--- a/src/main/twirl/account/ssh.scala.html
+++ b/src/main/twirl/account/ssh.scala.html
@@ -2,44 +2,46 @@
@import context._
@import view.helpers._
@html.main("SSH Keys"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("ssh", settings.ssh)
-  </div>
-  <div class="span9">
-    <div class="box">
-      <div class="box-header">SSH Keys</div>
-      <div class="box-content">
-        @if(sshKeys.isEmpty){
-          No keys
-        }
-        @sshKeys.zipWithIndex.map { case (key, i) =>
-          @if(i != 0){
-            <hr>
-          }
-          <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey))
-          <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
-        }
-      </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("ssh", settings.ssh)
    </div>
-    <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+    <div class="span9">
      <div class="box">
-        <div class="box-header">Add an SSH Key</div>
+        <div class="box-header">SSH Keys</div>
        <div class="box-content">
-          <fieldset>
-            <label for="title" class="strong">Title</label>
-            <div><span id="error-title" class="error"></span></div>
-            <input type="text" name="title" id="title" style="width: 400px;"/>
-          </fieldset>
-          <fieldset>
-            <label for="publicKey" class="strong">Key</label>
-            <div><span id="error-publicKey" class="error"></span></div>
-            <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
-          </fieldset>
-          <input type="submit" class="btn btn-success" value="Add"/>
+          @if(sshKeys.isEmpty){
+            No keys
+          }
+          @sshKeys.zipWithIndex.map { case (key, i) =>
+            @if(i != 0){
+              <hr>
+            }
+            <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
+            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
+          }
        </div>
      </div>
-    </form>
+      <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+        <div class="box">
+          <div class="box-header">Add an SSH Key</div>
+          <div class="box-content">
+            <fieldset>
+              <label for="title" class="strong">Title</label>
+              <div><span id="error-title" class="error"></span></div>
+              <input type="text" name="title" id="title" style="width: 400px;"/>
+            </fieldset>
+            <fieldset>
+              <label for="publicKey" class="strong">Key</label>
+              <div><span id="error-publicKey" class="error"></span></div>
+              <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
+            </fieldset>
+            <input type="submit" class="btn btn-success" value="Add"/>
+          </div>
+        </div>
+      </form>
+    </div>
  </div>
 </div>
-}
+}
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -1,22 +1,27 @@
@(active: String)(body: Html)(implicit context: app.Context)
@import context._
-<div class="row-fluid">
-  <div class="span3">
-    <div class="box">
-      <ul class="nav nav-tabs nav-stacked side-menu">
-        <li@if(active=="users"){ class="active"}>
-          <a href="@path/admin/users">User Management</a>
-        </li>
-        <li@if(active=="system"){ class="active"}>
-          <a href="@path/admin/system">System Settings</a>
-        </li>
-        <li>
-          <a href="@path/console/login.jsp">H2 Console</a>
-        </li>
-     </ul>
-   </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      <div class="box">
+        <ul class="nav nav-tabs nav-stacked side-menu">
+          <li@if(active=="users"){ class="active"}>
+            <a href="@path/admin/users">User Management</a>
+          </li>
+          <li@if(active=="system"){ class="active"}>
+            <a href="@path/admin/system">System Settings</a>
+          </li>
+          <li@if(active=="plugins"){ class="active"}>
+            <a href="@path/admin/plugins">Plugins</a>
+          </li>
+          <li>
+            <a href="@path/console/login.jsp">H2 Console</a>
+          </li>
+       </ul>
+     </div>
+    </div>
+    <div class="span9">
+      @body
+    </div>
  </div>
-  <div class="span9">
-    @body
-  </div>
-</div>
+</div>
--- a/src/main/twirl/admin/plugins/available.scala.html
+++ b/src/main/twirl/admin/plugins/available.scala.html
@@ -0,0 +1,37 @@
+@(plugins: List[app.SystemSettingsControllerBase.AvailablePlugin])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Plugins"){
+  @admin.html.menu("plugins"){
+    @tab("available")
+    <form action="@path/admin/plugins/_install" method="POST" validate="true">
+      <table class="table table-bordered">
+        <tr>
+          <th>ID</th>
+          <th>Version</th>
+          <th>Provider</th>
+          <th>Description</th>
+        </tr>
+        @plugins.zipWithIndex.map { case (plugin, i) =>
+          <tr>
+            <td>
+              <input type="checkbox" name="pluginId[@i]" value="@plugin.id"/>
+              @plugin.id
+            </td>
+            <td>@plugin.version</td>
+            <td><a href="@plugin.url">@plugin.author</a></td>
+            <td>@plugin.description</td>
+          </tr>
+        }
+      </table>
+      <input type="submit" id="install-plugins" class="btn btn-success" value="Install selected plugins"/>
+    </form>
+  }
+}
+<script>
+$(function(){
+  $('#install-plugins').click(function(){
+    return confirm('Selected plugin will be installed. Are you sure?');
+  });
+});
+</script>
--- a/src/main/twirl/admin/plugins/console.scala.html
+++ b/src/main/twirl/admin/plugins/console.scala.html
@@ -0,0 +1,37 @@
+@()(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("JavaScript Console"){
+  @admin.html.menu("plugins"){
+    @tab("console")
+    <form method="POST">
+      <div class="box">
+        <div class="box-header">JavaScript Console</div>
+        <div class="box-content">
+          <div id="editor" style="width: 100%; height: 400px;"></div>
+        </div>
+      </div>
+      <fieldset>
+        <input type="button" id="evaluate" class="btn btn-success" value="Evaluate"/>
+      </fieldset>
+    </form>
+  }
+}
+<script src="@assets/vendors/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+<script>
+$(function(){
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/monokai");
+  editor.getSession().setMode("ace/mode/javascript");
+
+  $('#evaluate').click(function(){
+    $.post('@path/admin/plugins/console', {
+      script: editor.getValue()
+    }, function(data){
+      alert('Success: ' + data);
+    }).fail(function(error){
+      alert(error.statusText);
+    });
+  });
+});
+</script>
--- a/src/main/twirl/admin/plugins/installed.scala.html
+++ b/src/main/twirl/admin/plugins/installed.scala.html
@@ -0,0 +1,47 @@
+@(plugins: List[plugin.Plugin],
+  updatablePlugins: List[app.SystemSettingsControllerBase.AvailablePlugin])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Plugins"){
+  @admin.html.menu("plugins"){
+    @tab("installed")
+    <form method="POST" validate="true">
+      <table class="table table-bordered">
+        <tr>
+          <th>ID</th>
+          <th>Version</th>
+          <th>Provider</th>
+          <th>Description</th>
+        </tr>
+        @plugins.zipWithIndex.map { case (plugin, i) =>
+          <tr>
+            <td>
+              <input type="checkbox" name="pluginId[@i]" value="@plugin.id"/>
+              @plugin.id
+            </td>
+            <td>
+              @plugin.version
+              @updatablePlugins.find(_.id == plugin.id).map { x =>
+                (@x.version is available)
+              }
+            </td>
+            <td><a href="@plugin.url">@plugin.author</a></td>
+            <td>@plugin.description</td>
+          </tr>
+        }
+      </table>
+      <input type="submit" id="update-plugins" class="btn btn-success" value="Update selected plugins" formaction="@path/admin/plugins/_update"/>
+      <input type="submit" id="delete-plugins" class="btn btn-danger" value="Uninstall selected plugins" formaction="@path/admin/plugins/_delete"/>
+    </form>
+  }
+}
+<script>
+$(function(){
+  $('#update-plugins').click(function(){
+    return confirm('Selected plugin will be updated. Are you sure?');
+  });
+  $('#delete-plugins').click(function(){
+    return confirm('Selected plugin will be removed permanently. Are you sure?');
+  });
+});
+</script>
--- a/src/main/twirl/admin/plugins/tab.scala.html
+++ b/src/main/twirl/admin/plugins/tab.scala.html
@@ -0,0 +1,9 @@
+@(active: String)(implicit context: app.Context)
+@import context._
+<ul class="nav nav-tabs">
+  <li@if(active == "installed"){ class="active"}><a href="@path/admin/plugins">Installed plugins</a></li>
+  <li@if(active == "available"){ class="active"}><a href="@path/admin/plugins/available">Available plugins</a></li>
+  @*
+  <li@if(active == "console"  ){ class="active"}><a href="@path/admin/plugins/console">JavaScript console</a></li>
+  *@
+</ul>
--- a/src/main/twirl/admin/system.scala.html
+++ b/src/main/twirl/admin/system.scala.html
@@ -133,6 +133,13 @@
                <span id="error-ldap_userNameAttribute" class="error"></span>
              </div>
            </div>
+            <div class="control-group">
+              <label class="control-label" for="ldapAdditionalFilterCondition">Additional filter condition</label>
+              <div class="controls">
+                <input type="text" id="ldapAdditionalFilterCondition" name="ldap.additionalFilterCondition" value="@settings.ldap.map(_.additionalFilterCondition)"/>
+                <span id="error-ldap_additionalFilterCondition" class="error"></span>
+              </div>
+            </div>
            <div class="control-group">
              <label class="control-label" for="ldapFullNameAttribute">Full name attribute</label>
              <div class="controls">
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -59,7 +59,7 @@ $(function(){
  });

  $('#addMember').click(function(){
-    $('#error-memberName').text('');
+    $('#error-members').text('');
    var userName = $('#memberName').val();

    // check empty
@@ -72,18 +72,18 @@ $(function(){
      return $(this).data('name') == userName;
    }).length > 0;
    if(exists){
-      $('#error-memberName').text('User has been already added.');
+      $('#error-members').text('User has been already added.');
      return false;
    }

    // check existence
-    $.post('@path/admin/users/_usercheck', {
+    $.post('@path/_user/existence', {
      'userName': userName
    }, function(data, status){
      if(data == 'true'){
        addMemberHTML(userName, false);
      } else {
-        $('#error-memberName').text('User does not exist.');
+        $('#error-members').text('User does not exist.');
      }
    });
  });
--- a/src/main/twirl/admin/users/list.scala.html
+++ b/src/main/twirl/admin/users/list.scala.html
@@ -1,71 +1,71 @@
-@(users: List[model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Manage Users"){
-  @admin.html.menu("users"){
-    <div class="pull-right" style="margin-bottom: 4px;">
-      <a href="@path/admin/users/_newuser" class="btn">New User</a>
-      <a href="@path/admin/users/_newgroup" class="btn">New Group</a>
-    </div>
-    <label for="includeRemoved">
-      <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
-      Include removed users
-    </label>
-    <table class="table table-bordered table-hover">
-      @users.map { account =>
-        <tr>
-          <td @if(account.isRemoved){style="background-color: #dddddd;"}>
-            <div class="pull-right">
-              @if(account.isGroupAccount){
-                <a href="@path/admin/users/@account.userName/_editgroup">Edit</a>
-              } else {
-                <a href="@path/admin/users/@account.userName/_edituser">Edit</a>
-              }
-            </div>
-            <div class="strong">
-              @avatar(account.userName, 20)
-              <a href="@url(account.userName)">@account.userName</a>
-              @if(account.isGroupAccount){
-                (Group)
-              } else {
-                @if(account.isAdmin){
-                  (Administrator)
-                } else {
-                  (Normal)
-                }
-              }
-              @if(account.isGroupAccount){
-                @members(account.userName).map { userName =>
-                  @avatar(userName, 20, tooltip = true)
-                }
-              }
-            </div>
-            <div>
-              <hr>
-              @if(!account.isGroupAccount){
-                <i class="icon-envelope"></i> @account.mailAddress
-              }
-              @account.url.map { url =>
-                <i class="icon-home"></i> @url
-              }
-            </div>
-            <div>
-              <span class="muted">Registered:</span> @datetime(account.registeredDate)
-              <span class="muted">Updated:</span> @datetime(account.updatedDate)
-              @if(!account.isGroupAccount){
-                <span class="muted">Last Login:</span> @account.lastLoginDate.map(datetime)
-              }
-            </div>
-          </td>
-        </tr>
-      }
-    </table>
-  }
-}
-<script>
-$(function(){
-  $('#includeRemoved').click(function(){
-    location.href = '@path/admin/users?includeRemoved=' + this.checked;
-  });
-});
+@(users: List[model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Manage Users"){
+  @admin.html.menu("users"){
+    <div class="pull-right" style="margin-bottom: 4px;">
+      <a href="@path/admin/users/_newuser" class="btn">New User</a>
+      <a href="@path/admin/users/_newgroup" class="btn">New Group</a>
+    </div>
+    <label for="includeRemoved">
+      <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
+      Include removed users
+    </label>
+    <table class="table table-bordered table-hover">
+      @users.map { account =>
+        <tr>
+          <td @if(account.isRemoved){style="background-color: #dddddd;"}>
+            <div class="pull-right">
+              @if(account.isGroupAccount){
+                <a href="@path/admin/users/@account.userName/_editgroup">Edit</a>
+              } else {
+                <a href="@path/admin/users/@account.userName/_edituser">Edit</a>
+              }
+            </div>
+            <div class="strong">
+              @avatar(account.userName, 20)
+              <a href="@url(account.userName)">@account.userName</a>
+              @if(account.isGroupAccount){
+                (Group)
+              } else {
+                @if(account.isAdmin){
+                  (Administrator)
+                } else {
+                  (Normal)
+                }
+              }
+              @if(account.isGroupAccount){
+                @members(account.userName).map { userName =>
+                  @avatar(userName, 20, tooltip = true)
+                }
+              }
+            </div>
+            <div>
+              <hr>
+              @if(!account.isGroupAccount){
+                <i class="icon-envelope"></i> @account.mailAddress
+              }
+              @account.url.map { url =>
+                <i class="icon-home"></i> @url
+              }
+            </div>
+            <div>
+              <span class="muted">Registered:</span> @datetime(account.registeredDate)
+              <span class="muted">Updated:</span> @datetime(account.updatedDate)
+              @if(!account.isGroupAccount){
+                <span class="muted">Last Login:</span> @account.lastLoginDate.map(datetime)
+              }
+            </div>
+          </td>
+        </tr>
+      }
+    </table>
+  }
+}
+<script>
+$(function(){
+  $('#includeRemoved').click(function(){
+    location.href = '@path/admin/users?includeRemoved=' + this.checked;
+  });
+});
 </script>
--- a/src/main/twirl/admin/users/user.scala.html
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -1,80 +1,80 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@html.main(if(account.isEmpty) "New User" else "Update User"){
-  @admin.html.menu("users"){
-    <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newuser} else {@path/admin/users/@account.get.userName/_edituser}" validate="true">
-      <div class="row-fluid">
-        <div class="span6">
-          <fieldset>
-            <label for="userName" class="strong">Username:</label>
-            <div>
-              <span id="error-userName" class="error"></span>
-            </div>
-            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-            @if(account.isDefined){
-              <label for="removed">
-                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
-                Disable
-              </label>
-            }
-          </fieldset>
-          @if(account.map(_.password.nonEmpty).getOrElse(true)){
-            <fieldset>
-              <label for="password" class="strong">
-                Password
-                @if(account.isDefined){
-                  (Input to change password)
-                }
-                :
-              </label>
-              <div>
-                <span id="error-password" class="error"></span>
-              </div>
-              <input type="password" name="password" id="password" value="" autocomplete="off"/>
-            </fieldset>
-          }
-          <fieldset>
-            <label for="fullName" class="strong">Full Name:</label>
-            <div>
-              <span id="error-fullName" class="error"></span>
-            </div>
-            <input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/>
-          </fieldset>
-          <fieldset>
-            <label for="mailAddress" class="strong">Mail Address:</label>
-            <div>
-              <span id="error-mailAddress" class="error"></span>
-            </div>
-            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-          </fieldset>
-          <fieldset>
-            <label class="strong">User Type:</label>
-            <label class="radio" for="userType_Normal">
-              <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
-            </label>
-            <label class="radio" for="userType_Admin">
-              <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
-            </label>
-          </fieldset>
-          <fieldset>
-            <label class="strong">URL (Optional):</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-          </fieldset>
-        </div>
-        <div class="span6">
-          <fieldset>
-            <label for="avatar" class="strong">Image (Optional)</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>
-    </form>
-  }
-}
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+@html.main(if(account.isEmpty) "New User" else "Update User"){
+  @admin.html.menu("users"){
+    <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newuser} else {@path/admin/users/@account.get.userName/_edituser}" validate="true">
+      <div class="row-fluid">
+        <div class="span6">
+          <fieldset>
+            <label for="userName" class="strong">Username:</label>
+            <div>
+              <span id="error-userName" class="error"></span>
+            </div>
+            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            @if(account.isDefined){
+              <label for="removed">
+                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
+                Disable
+              </label>
+            }
+          </fieldset>
+          @if(account.map(_.password.nonEmpty).getOrElse(true)){
+            <fieldset>
+              <label for="password" class="strong">
+                Password
+                @if(account.isDefined){
+                  (Input to change password)
+                }
+                :
+              </label>
+              <div>
+                <span id="error-password" class="error"></span>
+              </div>
+              <input type="password" name="password" id="password" value="" autocomplete="off"/>
+            </fieldset>
+          }
+          <fieldset>
+            <label for="fullName" class="strong">Full Name:</label>
+            <div>
+              <span id="error-fullName" class="error"></span>
+            </div>
+            <input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/>
+          </fieldset>
+          <fieldset>
+            <label for="mailAddress" class="strong">Mail Address:</label>
+            <div>
+              <span id="error-mailAddress" class="error"></span>
+            </div>
+            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+          </fieldset>
+          <fieldset>
+            <label class="strong">User Type:</label>
+            <label class="radio" for="userType_Normal">
+              <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
+            </label>
+            <label class="radio" for="userType_Admin">
+              <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
+            </label>
+          </fieldset>
+          <fieldset>
+            <label class="strong">URL (Optional):</label>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
+            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+          </fieldset>
+        </div>
+        <div class="span6">
+          <fieldset>
+            <label for="avatar" class="strong">Image (Optional)</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>
+    </form>
+  }
+}
--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -8,41 +8,43 @@
@import context._
@import view.helpers._
@html.main("Your Issues"){
-@dashboard.html.tab("issues")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "all"){ class="active"}>
-        <a href="@path/dashboard/issues/repos@condition.toURL">
-          <span class="count-right">@allCount</span>
-          In your repositories
-        </a>
-      </li>
-      <li@if(filter == "assigned"){ class="active"}>
-        <a href="@path/dashboard/issues/assigned@condition.toURL">
-          <span class="count-right">@assignedCount</span>
-          Assigned to you
-        </a>
-      </li>
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/issues/created_by@condition.toURL">
-          <span class="count-right">@createdByCount</span>
-          Created by you
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("issues")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "all"){ class="active"}>
+          <a href="@path/dashboard/issues/repos@condition.toURL">
+            <span class="count-right">@allCount</span>
+            In your repositories
+          </a>
+        </li>
+        <li@if(filter == "assigned"){ class="active"}>
+          <a href="@path/dashboard/issues/assigned@condition.toURL">
+            <span class="count-right">@assignedCount</span>
+            Assigned to you
+          </a>
+        </li>
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/issues/created_by@condition.toURL">
+            <span class="count-right">@createdByCount</span>
+            Created by you
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
  </div>
-  @listparts
 </div>
 }
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ b/src/main/twirl/dashboard/pulls.scala.html
@@ -6,35 +6,37 @@
@import context._
@import view.helpers._
@html.main("Your Issues"){
-@dashboard.html.tab("pulls")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/owned@condition.toURL">
-          <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
-          Yours
-        </a>
-      </li>
-      <li@if(filter == "not_created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/public@condition.toURL">
-          <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
-          Public
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@path/dashboard/pulls/for/@owner/@name">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("pulls")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/owned@condition.toURL">
+            <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
+            Yours
+          </a>
+        </li>
+        <li@if(filter == "not_created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/public@condition.toURL">
+            <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
+            Public
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@path/dashboard/pulls/for/@owner/@name">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
  </div>
-  @listparts
 </div>
 }
--- a/src/main/twirl/dashboard/tab.scala.html
+++ b/src/main/twirl/dashboard/tab.scala.html
@@ -1,9 +1,13 @@
@(active: String = "")(implicit context: app.Context)
@import context._
+@import view.helpers._
 <ul class="nav nav-tabs">
  <li@if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
  @if(loginAccount.isDefined){
    <li@if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li>
    <li@if(active == "issues"){ class="active"}><a href="@path/dashboard/issues/repos">Issues</a></li>
  }
+  @if(active == ""){
+    <li class="pull-right"><a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a></li>
+  }
 </ul>
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -1,73 +0,0 @@
-@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-@if(repository.commitCount > 0){
-  <div class="pull-right">
-    <div class="input-prepend">
-      <a href="@path/@repository.owner/@repository.name/fork" class="btn" style="margin-bottom: 10px;">Fork</a>
-      <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
-    </div>
-  </div>
-}
-<div class="head">
-  @if(repository.repository.isPrivate){
-  <img src="@assets/common/images/repo_private_lg.png"/>
-  } else {
-    @if(repository.repository.originUserName.isDefined){
-      <img src="@assets/common/images/repo_fork_lg.png"/>
-    } else {
-      <img src="@assets/common/images/repo_public_lg.png"/>
-    }
-  }
-  <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
-  
-  @defining(repository.repository){ x =>
-    @if(repository.repository.originRepositoryName.isDefined){
-      <div class="forked">
-        forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
-      </div>
-    }
-  }
-</div>
-@repository.repository.description.map { description =>
-  <p>@description</p>
-}
-<table class="global-nav box-header">
-  <tr>
-    <th class="box-header@if(active=="code"){ active}">
-      <a href="@url(repository)">Code</a>
-    </th>
-    <th class="box-header@if(active=="issues"){ active}">
-      <a href="@url(repository)/issues">Issues</a>
-      @if(repository.issueCount > 0){
-        <span class="badge">@repository.issueCount</span>
-      }
-    </th>
-    <th class="box-header@if(active=="pulls"){ active}">
-      <a href="@url(repository)/pulls">Pull Requests</a>
-      @if(repository.pullCount > 0){
-        <span class="badge">@repository.pullCount</span>
-      }
-    </th>
-    <th class="box-header@if(active=="wiki"){ active}">
-      <a href="@url(repository)/wiki">Wiki</a>
-    </th>
-    <th class="box-header@if(active=="network"){ active}">
-      <a href="@url(repository)/network/members">Network</a>
-    </th>
-    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-    <th class="box-header@if(active=="settings"){ active}">
-      <a href="@url(repository)/settings">Settings</a>
-    </th>
-    }
-  </tr>
-</table>
-<script type="text/javascript">
-$(function(){
-  $('table.global-nav th.box-header').click(function(){
-    location.href = $(this).find('a').attr('href');
-    return false;
-  });
-});
-</script>
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -1,98 +1,98 @@
-@(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">
-      @(activity.activityType match {
-        case "open_issue"        => detailActivity(activity, "activity-issue.png")
-        case "comment_issue"     => detailActivity(activity, "activity-comment.png")
-        case "close_issue"       => detailActivity(activity, "activity-issue-close.png")
-        case "reopen_issue"      => detailActivity(activity, "activity-issue-reopen.png")
-        case "open_pullreq"      => detailActivity(activity, "activity-merge.png")
-        case "merge_pullreq"     => detailActivity(activity, "activity-merge.png")
-        case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
-        case "create_branch"     => simpleActivity(activity, "activity-branch.png")
-        case "delete_branch"     => simpleActivity(activity, "activity-delete.png")
-        case "create_tag"        => simpleActivity(activity, "activity-tag.png")
-        case "delete_tag"        => simpleActivity(activity, "activity-delete.png")
-        case "fork"              => simpleActivity(activity, "activity-fork.png")
-        case "push"  => customActivity(activity, "activity-commit.png"){
-          <div class="small activity-message">
-            {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
-              if(i == 3){
-                <div>...</div>
-              } else {
-                if(commit.nonEmpty){
-                  <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 "create_wiki" => customActivity(activity, "activity-wiki.png"){
-          <div class="small activity-message">
-            Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
-          </div>
-        }
-        case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
-          activity.additionalInfo.get.split(":") match {
-            case Array(pageName, commitId) =>
-              <div class="small activity-message">
-                Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}"}>{pageName}</a>.
-                <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}/_compare/${commitId.substring(0, 7)}^...${commitId.substring(0, 7)}"}>View the diff »</a>
-              </div>
-            case Array(pageName) =>
-              <div class="small activity-message">
-                Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}"}>{pageName}</a>.
-              </div>
-          }
-        }
-      })
-    </div>
-  }
-}
-
-@detailActivity(activity: model.Activity, image: String) = {
-  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
-  <div class="activity-content">
-    <div class="muted small">@datetime(activity.activityDate)</div>
-    <div class="strong">
-      @avatar(activity.activityUserName, 16)
-      @activityMessage(activity.message)
-    </div>
-    @activity.additionalInfo.map { additionalInfo =>
-      <div class=" activity-message">@additionalInfo</div>
-    }
-  </div>
-}
-
-@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
-  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
-  <div class="activity-content">
-    <div class="muted small">@datetime(activity.activityDate)</div>
-    <div class="strong">
-      @avatar(activity.activityUserName, 16)
-      @activityMessage(activity.message)
-    </div>
-    @additionalInfo
-  </div>
-}
-
-@simpleActivity(activity: model.Activity, image: String) = {
-  <div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
-  <div class="activity-content">
-    <div>
-      @avatar(activity.activityUserName, 16)
-      @activityMessage(activity.message)
-      <span class="muted small">@datetime(activity.activityDate)</span>
-    </div>
-  </div>
-}
-
+@(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">
+      @(activity.activityType match {
+        case "open_issue"        => detailActivity(activity, "activity-issue.png")
+        case "comment_issue"     => detailActivity(activity, "activity-comment.png")
+        case "close_issue"       => detailActivity(activity, "activity-issue-close.png")
+        case "reopen_issue"      => detailActivity(activity, "activity-issue-reopen.png")
+        case "open_pullreq"      => detailActivity(activity, "activity-merge.png")
+        case "merge_pullreq"     => detailActivity(activity, "activity-merge.png")
+        case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
+        case "create_branch"     => simpleActivity(activity, "activity-branch.png")
+        case "delete_branch"     => simpleActivity(activity, "activity-delete.png")
+        case "create_tag"        => simpleActivity(activity, "activity-tag.png")
+        case "delete_tag"        => simpleActivity(activity, "activity-delete.png")
+        case "fork"              => simpleActivity(activity, "activity-fork.png")
+        case "push"  => customActivity(activity, "activity-commit.png"){
+          <div class="small activity-message">
+            {activity.additionalInfo.get.split("\n").reverse.filter(_ matches "[0-9a-z]{40}:.*").take(4).zipWithIndex.map{ case (commit, i) =>
+              if(i == 3){
+                <div>...</div>
+              } else {
+                if(commit.nonEmpty){
+                  <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 "create_wiki" => customActivity(activity, "activity-wiki.png"){
+          <div class="small activity-message">
+            Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
+          </div>
+        }
+        case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+          activity.additionalInfo.get.split(":") match {
+            case Array(pageName, commitId) =>
+              <div class="small activity-message">
+                Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}"}>{pageName}</a>.
+                <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}/_compare/${commitId.substring(0, 7)}^...${commitId.substring(0, 7)}"}>View the diff »</a>
+              </div>
+            case Array(pageName) =>
+              <div class="small activity-message">
+                Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${pageName}"}>{pageName}</a>.
+              </div>
+          }
+        }
+      })
+    </div>
+  }
+}
+
+@detailActivity(activity: model.Activity, image: String) = {
+  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @activity.additionalInfo.map { additionalInfo =>
+      <div class=" activity-message">@additionalInfo</div>
+    }
+  </div>
+}
+
+@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
+  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @additionalInfo
+  </div>
+}
+
+@simpleActivity(activity: model.Activity, image: String) = {
+  <div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div>
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+      <span class="muted small">@datetime(activity.activityDate)</span>
+    </div>
+  </div>
+}
+
--- a/src/main/twirl/helper/attached.scala.html
+++ b/src/main/twirl/helper/attached.scala.html
@@ -0,0 +1,27 @@
+@(owner: String, repository: String)(textarea: Html)(implicit context: app.Context)
+@import context._
+<div class="muted attachable">
+  @textarea
+  <div class="clickable">Attach images by dragging &amp; dropping, or selecting them.</div>
+</div>
+@defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
+<script>
+$(function(){
+  $([$('#@textareaId').closest('div')[0], $('#@textareaId').next('div')[0]]).dropzone({
+    url: '@path/upload/image/@owner/@repository',
+    maxFilesize: 10,
+    acceptedFiles: 'image/*',
+    dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, or JPG.',
+    previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your images...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
+    success: function(file, id) {
+      var images = '\n![' + file.name.split('.')[0] + '](@baseUrl/@owner/@repository/_attached/' + id + ')';
+      $('#@textareaId').val($('#@textareaId').val() + images);
+      $(file.previewElement).prevAll('div.dz-preview').addBack().remove();
+    }
+  });
+
+  // Adjust clickable area width
+  $('#@textareaId').next('div.clickable').css('width', ($('#@textareaId').width() + 8) + 'px');
+});
+</script>
+}
--- a/Show More
+++ b/Show More