@@ -3,7 +3,8 @@

   my $api = gitprep_api;

   # Paramters

-  my $project = param('project');

+  my $user_id = param('user');

+  my $project_id = param('project');

   my $diff = param('diff');

   my ($from_rev, $rev) = $diff =~ /(.+)\.\.(.+)/;

   $rev = $diff unless defined $rev;

@@ -12,7 +13,7 @@

   my $git = app->git;

   # Commit

-  my $commit = $git->get_commit(app->rep_info($user, $project), $rev);

+  my $commit = $git->get_commit(app->rep_info($user_id, $project_id), $rev);

   unless ($commit) {

     $self->reply->not_found;

@@ -33,19 +34,19 @@

   )->value;

   # Branches

-  my $branch_refs = $git->references(app->rep_info($user, $project), 'heads');

+  my $branch_refs = $git->references(app->rep_info($user_id, $project_id), 'heads');

   my $branches = $branch_refs->{$commit->{id}} || [];

   # Tags

-  my $tag_refs = $git->references(app->rep_info($user, $project), 'tags');

+  my $tag_refs = $git->references(app->rep_info($user_id, $project_id), 'tags');

   my $tags = $tag_refs->{$commit->{id}} || [];

-  # Global variable for included template

-  stash(

+  # commit_body args

+  my %commit_body_args = (

+    user => $user_id,

+    project => $project_id,

     rev => $rev,

-    from_rev => $from_rev,

-    commit => $commit,

-    parents => $commit->{parents}

+    from_rev => $from_rev

   );

   layout 'common', title => "$commit->{title_short} \x{30fb} $commit_short_id";

@@ -86,19 +87,19 @@

           % if (@$branches || @$tags) {

             <div>

               % for my $branch (@$branches) {

-                <i class="icon-share-alt" style="padding-right:1px"></i><a href="<%= url_for("/$user/$project/tree/$branch") %>"><%= $branch %></a>

+                <i class="icon-share-alt" style="padding-right:1px"></i><a href="<%= url_for("/$user_id/$project_id/tree/$branch") %>"><%= $branch %></a>

               % }

               % for my $tag (@$tags) {

                 <span style="padding-left:5px">

-                  <i class="icon-tag" style="padding-right:2px"></i><a href="<%= url_for("/$user/$project/tree/$tag") %>"><%= $tag %></a>

+                  <i class="icon-tag" style="padding-right:2px"></i><a href="<%= url_for("/$user_id/$project_id/tree/$tag") %>"><%= $tag %></a>

                 </span>

               % }

             </div>

           % }

         </li>

         <li class="last-child">

-          <a class="btn btn-primary" href="<%= url_for("/$user/$project/tree/$commit->{id}") %>">

+          <a class="btn btn-primary" href="<%= url_for("/$user_id/$project_id/tree/$commit->{id}") %>">

             Browse files

           </a>

         </li>

@@ -126,7 +127,7 @@

           % } elsif (@$parents == 1) {

             <div class="commits-summary-parent">

               <span>1 parent</span>

-              <a href="<%= url_for("/$user/$project/commit/$parents->[0]") %>">

+              <a href="<%= url_for("/$user_id/$project_id/commit/$parents->[0]") %>">

                 <%= substr($parents->[0], 0, 7) %>

               </a>

             </div>

@@ -134,11 +135,11 @@

             <div class="commits-summary-parent">

               <span>2 parents</span>:

-              <a class="font-black" href="<%= url_for("/$user/$project/commit/$parents->[0]") %>">

+              <a class="font-black" href="<%= url_for("/$user_id/$project_id/commit/$parents->[0]") %>">

                 <%= substr($parents->[0], 0, 7) %>

               </a>

               +

-              <a class="font-black" href="<%= url_for("/$user/$project/commit/$parents->[1]") %>">

+              <a class="font-black" href="<%= url_for("/$user_id/$project_id/commit/$parents->[1]") %>">

                 <%= substr($parents->[1], 0, 7) %>

               </a>

             </div>

@@ -151,7 +152,7 @@

     </li>

   </ul>

-  %= include '/include/commit_body';

+  %= include '/include/commit_body', %commit_body_args;

 </div>

 %= include '/include/footer';

@@ -259,6 +259,8 @@

   # commit_body args

   my %commit_body_args = (

+    user => $base_user_id,

+    project => $base_project_id,

     rep_info => $work_rep_info,

     rev => $end_commit_id,

     from_rev => $start_commit_id

@@ -1,4 +1,6 @@

 <%

+  my $user_id = stash('user');

+  my $project_id = stash('project');

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

@@ -21,22 +23,22 @@

   if ($blob_diff->{binary}) {

     if ($status eq 'A') {

-      if ($git->blob_is_image(app->rep_info($user, $project), $rev, $file)) {

+      if ($git->blob_is_image(app->rep_info($user_id, $project_id), $rev, $file)) {

         $binary_rev_shown = 1;

       }

       else {

         $binary_not_shown = 1;

       }

     } elsif ($status eq 'D') {

-      if ($git->blob_is_image(app->rep_info($user, $project), $from_rev, $file)) {

+      if ($git->blob_is_image(app->rep_info($user_id, $project_id), $from_rev, $file)) {

         $binary_from_rev_shown = 1;

       }

       else {

         $binary_not_shown = 1;

       }

     } else {

-      if ($git->blob_is_image(app->rep_info($user, $project), $from_rev, $file)

-        && $git->blob_is_image(app->rep_info($user, $project), $from_rev, $file)) {

+      if ($git->blob_is_image(app->rep_info($user_id, $project_id), $from_rev, $file)

+        && $git->blob_is_image(app->rep_info($user_id, $project_id), $from_rev, $file)) {

         $binary_from_rev_shown = 1;

         $binary_rev_shown = 1;

       }

@@ -62,11 +64,11 @@

       </div>

       <div class="last-child">

         % if ($status eq 'D') {

-          <a class="btn" href="<%= url_for("/$user/$project/blob/$from_rev/$file") %>">

+          <a class="btn" href="<%= url_for("/$user_id/$project_id/blob/$from_rev/$file") %>">

             <b>View</b>

           </a>

         % } else {

-          <a class="btn" href="<%= url_for("/$user/$project/blob/$rev/$file") %>">

+          <a class="btn" href="<%= url_for("/$user_id/$project_id/blob/$rev/$file") %>">

             <b>View</b>

           </a>

         % }

@@ -88,14 +90,14 @@

           % } else {

             <div class="commit-diff-image">

               % if ($binary_from_rev_shown) {

-                <a href="<%= url_for("/$user/$project/blob/$from_rev/$file") %>">

-                  <img src="<%= url_for("/$user/$project/raw/$from_rev/$file") %>" style="border:1px solid red;padding:1px;margin-right:20px">

+                <a href="<%= url_for("/$user_id/$project_id/blob/$from_rev/$file") %>">

+                  <img src="<%= url_for("/$user_id/$project_id/raw/$from_rev/$file") %>" style="border:1px solid red;padding:1px;margin-right:20px">

                 </a>          

               % }

               % if ($binary_rev_shown) {

-                <a href="<%= url_for("/$user/$project/blob/$rev/$file") %>">

-                  <img src="<%= url_for("/$user/$project/raw/$rev/$file") %>" style="border:1px solid green;padding:1px;margin-left:20px">

+                <a href="<%= url_for("/$user_id/$project_id/blob/$rev/$file") %>">

+                  <img src="<%= url_for("/$user_id/$project_id/raw/$rev/$file") %>" style="border:1px solid green;padding:1px;margin-left:20px">

                 </a>

               % }

             </div>

@@ -1,6 +1,8 @@

 <%

   # Parameters

-  my $rep_info = stash('rep_info') // app->rep_info($user, $project);

+  my $user_id = stash('user');

+  my $project_id = stash('project');

+  my $rep_info = stash('rep_info') // app->rep_info($user_id, $project_id);

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

@@ -12,7 +14,7 @@

   else {

     $ignore_space_change = app->dbi->model('project')->select(

       'ignore_space_change',

-      where => {user_id => $user, name => $project}

+      where => {user_id => $user_id, name => $project_id}

     )->value;

   }

@@ -301,8 +301,10 @@

   my $pre_content_http = "git pull $http_rep_url $target_branch";

   my $pre_content_ssh = "git pull $ssh_rep_url $target_branch";

-  # Commit body arguments

+  # commit_body args

   my %commit_body_args = (

+    user => $base_user_id,

+    project => $base_project_id,

     rep_info => $work_rep_info,

     rev => $end_commit_id,

     from_rev => $start_commit_id