@@ -205,9 +205,13 @@ sub startup {

       table => 'pull_request',

       primary_key => 'row_id',

       join => [

-        'left join user on pull_request.open_user = user.row_id',

-        'left join project on pull_request.project = project.row_id',

-        'left join user as project_user on project.user = project_user.row_id'

+        'left join user as pull_request__open_user on pull_request.open_user = pull_request__open_user.row_id',

+        'left join project as pull_request__base_project on pull_request.base_project = pull_request__base_project.row_id',

+        'left join user as pull_request__base_project__user'

+          . ' on pull_request__base_project.user = pull_request__base_project__user.row_id',

+        'left join project as pull_request__target_project on pull_request.target_project = pull_request__target_project.row_id',

+        'left join user as pull_request__target_project__user'

+          . ' on pull_request__target_project.user = pull_request__target_project__user.row_id'

       ]

     },

     {

@@ -19,6 +19,21 @@ has text_exts => sub { ['txt'] };

 has 'time_zone_second';

 has 'app';

+sub ref_to_object_id {

+  my ($self, $rep_info, $ref) = @_;

+  

+  my @cmd = $self->cmd($rep_info, 'show-ref', $ref);

+  open my $fh, '-|', @cmd

+    or croak "Can't execute git show-ref: @cmd";

+  my $result = <$fh>;

+  

+  return unless defined $result;

+  

+  my ($object_id) = split /\s+/, $result;

+  

+  return $object_id;

+}

+

 sub current_branch {

   my ($self, $rep_info) = @_;

@@ -745,7 +760,6 @@ sub path_to_hash {

   return $id;

 }

-

 sub last_activity {

   my ($self, $rep) = @_;

@@ -17,59 +17,17 @@ has 'authorized_keys_file';

 has '_tmp_branch' => '__gitprep_tmp_branch__';

-sub merge_and_push {

-  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

-  

-  # Merge

-  my $target_user_id = $rep_info2->{user};

-  my @git_merge_cmd = $self->app->git->cmd(

-    $work_rep_info,

-    'merge',

-    "--message=merge $target_user_id/$target_branch",

-    "$target_user_id/$target_branch"

-  );

-  Gitprep::Util::run_command(@git_merge_cmd)

-    or Carp::croak "Can't execute git merge: @git_merge_cmd";

-  

-  # Push

-  my @git_push_cmd = $self->app->git->cmd($work_rep_info, 'push', 'origin', $base_branch);

-  Gitprep::Util::run_command(@git_push_cmd)

-    or Carp::croak "Can't execute git push: @git_push_cmd";

-}

-

 sub prepare_merge {

   my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

   # Fetch base repository

   my $base_user_id = $rep_info1->{user};

-  my @git_fetch_base_cmd = $self->app->git->cmd($work_rep_info, 'fetch', 'origin', $base_branch);

+  my @git_fetch_base_cmd = $self->app->git->cmd($work_rep_info, 'fetch', 'origin');

   Gitprep::Util::run_command(@git_fetch_base_cmd)

     or Carp::croak "Can't execute git fetch: @git_fetch_base_cmd";

-  # Remeve remote

-  my $target_user_id = $rep_info2->{user};

-  my @git_remote_remove_cmd =  $self->app->git->cmd(

-    $work_rep_info,

-    'remote',

-    'remove',

-    $target_user_id

-  );

-  Gitprep::Util::run_command(@git_remote_remove_cmd);

-  

-  # Set remote add target repository

-  my $target_git_dir = $rep_info2->{git_dir};

-  my @git_remote_add_cmd = $self->app->git->cmd(

-    $work_rep_info,

-    'remote',

-    'add',

-    $target_user_id,

-    $target_git_dir

-  );

-  Gitprep::Util::run_command(@git_remote_add_cmd)

-    or Carp::croak "Can't execute git remote add: @git_remote_add_cmd";

-  

   # Fetch target repository

-  my @git_fetch_target_cmd = $self->app->git->cmd($work_rep_info, 'fetch', $target_user_id, $target_branch);

+  my @git_fetch_target_cmd = $self->app->git->cmd($work_rep_info, 'fetch', $rep_info2->{git_dir});

   Gitprep::Util::run_command(@git_fetch_target_cmd)

     or Carp::croak "Can't execute git fetch: @git_fetch_target_cmd";

@@ -144,13 +102,15 @@ sub prepare_merge {

 sub merge {

   my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

+  my $object_id = $self->app->git->ref_to_object_id($rep_info2, $target_branch);

+  

   # Merge

   my $target_user_id = $rep_info2->{user};

   my @git_merge_cmd = $self->app->git->cmd(

     $work_rep_info,

     'merge',

-    "--message=merge $target_user_id/$target_branch",

-    "$target_user_id/$target_branch"

+    "--message=[merge]$target_user_id/$target_branch",

+    $object_id

   );

   my $success = Gitprep::Util::run_command(@git_merge_cmd);

@@ -169,64 +129,10 @@ sub push {

     'origin',

     "$tmp_branch:$base_branch"

   );

-  warn "@git_push_cmd";

   Gitprep::Util::run_command(@git_push_cmd)

     or Carp::croak "Can't execute git push: @git_push_cmd";

 }

-=pod

-sub check_merge_automatical {

-  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

-  

-  # Create patch

-  my $tmp_branch = $self->_tmp_branch;

-  my $target_user_id = $rep_info2->{user};

-  my @git_format_patch_cmd = $self->app->git->cmd(

-    $work_rep_info,

-    'format-patch',

-    "origin/$base_branch..$target_user_id/$target_branch",

-    "--stdout"

-  );

-  open my $git_format_patch_fh, '-|', @git_format_patch_cmd

-    or Carp::croak "Can't execute git format-patch: @git_format_patch_cmd";

-  my $patch_str = do { local $/; <$git_format_patch_fh> };

-  

-  warn "@git_format_patch_cmd";

-  

-  # Write patch to file

-  my $tmp_dir = File::Temp->newdir(DIR => $self->app->home->rel_file('/tmp'));

-  my $patch_file = "$tmp_dir/test.patch";

-  open my $patch_fh, '>', $patch_file

-    or Carp::croak "Can't open patch file $patch_file: $!";

-  print $patch_fh $patch_str;

-  close $patch_fh;

-  

-  # Check if this patch can be applied

-  use Cwd;

-  my $original_cwd = getcwd;

-  chdir $work_rep_info->{work_tree}

-    or croak "Can't change working directory: $work_rep_info->{work_tree}";

-  warn "aaaaaaaaaaaaaaaaa $work_rep_info->{work_tree}";

-  my @git_apply_cmd = $self->app->git->cmd(

-    $work_rep_info,

-    'apply',

-    $patch_file,

-    '--check'

-  );

-  chdir $original_cwd

-    or croak "Can't change working directory: $original_cwd";

-  

-  warn "@git_apply_cmd";

-  

-  # sleep 300;

-  my $automatical = Gitprep::Util::run_command(@git_apply_cmd);

-  

-  warn "bbbbbbbbbbbbbbbbbbbb $automatical";

-  

-  return $automatical;

-}

-=cut

-

 sub lock_rep {

   my ($self, $rep_info) = @_;

@@ -157,10 +157,11 @@ EOS

     my $sql = <<"EOS";

 create table pull_request (

   row_id integer primary key autoincrement,

-  project integer not null default 0,

-  branch1 not null default '',

-  branch2 not null default '',

-  unique(project, branch1, branch2)

+  base_project integer not null default 0,

+  base_branch not null default '',

+  target_project integer not null default 0,

+  target_branch not null default '',

+  unique(base_project, base_branch, target_project, target_branch)

 );

 EOS

     $dbi->execute($sql);

@@ -178,7 +179,7 @@ EOS

   }

   # Check pull_request table

-  eval { $dbi->select([qw/row_id project branch1 branch2 title open open_time open_user/], table => 'pull_request') };

+  eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch title open open_time open_user/], table => 'pull_request') };

   if ($@) {

     my $error = "Can't create pull_request table properly: $@";

     die $error;

@@ -232,10 +232,10 @@

                 my $pull_request = app->dbi->model('pull_request')->select(

                   {__MY__ => ['row_id', 'open']},

                   where => {

-                    'project.id' => $project_id,

-                    'project_user.id' => $user_id,

-                    branch1 => $default_branch_name,

-                    branch2 => $branch_name

+                    'pull_request__base_project.id' => $project_id,

+                    'pull_request__base_project__user.id' => $user_id,

+                    base_branch => $default_branch_name,

+                    target_branch => $branch_name

                   }

                 )->one;

               %>

@@ -3,25 +3,35 @@

   my $api = gitprep_api;

   # Parameters

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

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

-  my $from_rev = param('rev1');

-  my $rev = param('rev2');

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

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

+  my $base_branch = param('rev1');

+  my $user_id_and_target_branch = param('rev2');

   my $page = param('page') || 0;

   my $expand = param('expand');

+  # Default base branch

+  $base_branch //= app->manager->default_branch($base_user_id, $base_project_id);

+  

+  # Base project

+  my $base_project = app->dbi->model('project')->select(

+    {__MY__ => '*'},

+    where => {'project.id' => $base_project_id, 'user.id' => $base_user_id}

+  )->one;

+  

   # Get target user, project, branch

   my $target_user_id;

   my $target_branch;

   my $target_project;

-  if ($rev =~ /^([^:]+):(.+)/) {

+  if ($user_id_and_target_branch =~ /^([^:]+):(.+)/) {

     $target_user_id = $1;

     $target_branch = $2;

-    $target_project = $self->app->manager->child_project($user_id, $project_id, $target_user_id);

+    $target_project = $self->app->manager->child_project($base_user_id, $base_project_id, $target_user_id);

   }

-  

-  unless ($from_rev) {

-    $from_rev = app->manager->default_branch($user_id, $project_id);

+  else {

+    $target_user_id = $base_user_id;

+    $target_branch = $user_id_and_target_branch;

+    $target_project = $base_project

   }

   # Git

@@ -36,15 +46,20 @@

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

         'project.row_id',

-        where => {'user.id' => $user_id, 'project.id' => $project_id}

+        where => {'user.id' => $base_user_id, 'project.id' => $base_project_id}

       )->value;

       my $pull_request = app->dbi->model('pull_request')->select(

-        where => {project => $project_row_id, branch1 => $from_rev, branch2 => $rev}

+        where => {

+          base_project => $project_row_id,

+          base_branch => $base_branch,

+          target_project => $target_project->{id},

+          target_branch => $target_branch

+        }

       )->one;

       if ($pull_request) {

-        $self->redirect_to("/$user_id/$project_id/pull/$pull_request->{row_id}");

+        $self->redirect_to("/$base_user_id/$base_project_id/pull/$pull_request->{row_id}");

         return;

       }

       else {

@@ -52,16 +67,17 @@

         my $now_epoch = $now_tm->epoch;

         my $user_row_id = app->dbi->model('user')->select(

           'row_id',

-          where => {id => $user_id}

+          where => {id => $base_user_id}

         )->value;

         my $new_pull_request_row_id;

         app->dbi->connector->txn(sub {

           # New pull request

           my $new_pull_request_params = {

-            project => $project_row_id,

-            branch1 => $from_rev,

-            branch2 => $rev,

+            base_project => $project_row_id,

+            base_branch => $base_branch,

+            target_project => $target_project->{row_id},

+            target_branch => $target_branch,

             title => $title,

             open => 1,

             open_time => $now_epoch,

@@ -73,9 +89,10 @@

           $new_pull_request_row_id = app->dbi->model('pull_request')->select(

             'row_id',

             where => {

-              project => $project_row_id,

-              branch1 => $from_rev,

-              branch2 => $rev

+              base_project => $project_row_id,

+              base_branch => $base_branch,

+              target_project => $target_project->{row_id},

+              target_branch => $target_branch

             }

           )->value;

@@ -100,17 +117,19 @@

             user => $user_row_id

           };

+          use D;d $new_pull_request_message_params;

+          

           app->dbi->model('pull_request_message')->insert($new_pull_request_message_params);

         });

-        $self->redirect_to("/$user_id/$project_id/pull/$new_pull_request_row_id");

+        $self->redirect_to("/$base_user_id/$base_project_id/pull/$new_pull_request_row_id");

         return;

       }

     }

   }

   # Can merge

-  my $rep_info = app->rep_info($user_id, $project_id);

+  my $rep_info = app->rep_info($base_user_id, $base_project_id);

   my $merge_success;

   my $rep_info2;

   if ($target_project) {

@@ -121,10 +140,10 @@

   }

   # Create working repository if it don't exist

-  $self->app->manager->create_work_rep($user_id, $project_id);

+  $self->app->manager->create_work_rep($base_user_id, $base_project_id);

   # Lock working repository

-  my $work_rep_info = app->work_rep_info($user_id, $project_id);

+  my $work_rep_info = app->work_rep_info($base_user_id, $base_project_id);

   {

     my $lock_fh = $self->app->manager->lock_rep($work_rep_info);

@@ -132,23 +151,23 @@

     $self->app->manager->prepare_merge(

       $work_rep_info,

       $rep_info,

-      $from_rev,

+      $base_branch,

       $rep_info2,

-      $rev

+      $target_branch

     );

     # Check merge automatically

     $merge_success = $self->app->manager->merge(

       $work_rep_info,

       $rep_info,

-      $from_rev,

+      $base_branch,

       $rep_info2,

-      $rev

+      $target_branch

     );

   }

   # Commits

-  my $commits = $git->forward_commits($rep_info, $from_rev, $rev);

+  my $commits = $git->forward_commits($rep_info, $base_branch, $target_branch);

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -161,10 +180,10 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit($rep_info, $from_rev, $rev);

+  my $start_commit = $git->separated_commit($rep_info, $base_branch, $target_branch);

   # End commit

-  my $end_commit = $git->get_commit($rep_info2, $rev);

+  my $end_commit = $git->get_commit($rep_info2, $target_branch);

   if (!$start_commit || !$end_commit) {

     $self->reply->not_found;

@@ -189,7 +208,7 @@

     from_rev => $start_commit->{id}

   );

-  layout 'common', title => "Comparing $from_rev...$rev \x{30fb} $user_id/$project_id";

+  layout 'common', title => "Comparing $base_branch...$target_branch \x{30fb} $base_user_id/$base_project_id";

 %>

@@ -210,7 +229,7 @@

     $('[name=base-branch]').on('keypress', function (e) {

       // Enter

       if (e.which == 13) {

-        var href = '<%= url_for("/$user_id/$project_id/compare/") %>' + $(this).val() + '...<%= $rev %>';

+        var href = '<%= url_for("/$base_user_id/$base_project_id/compare/") %>' + $(this).val() + '...<%= $target_branch %>';

         if (<%= $expand ? 1 : 0 %>) {

           href = href + '?expand=1';

         }

@@ -232,7 +251,7 @@

     $('[name=compare-branch]').on('keypress', function (e) {

       // Enter

       if (e.which == 13) {

-        var href = '<%= url_for("/$user_id/$project_id/compare/") %>' + '<%= $from_rev %>...' + $(this).val();

+        var href = '<%= url_for("/$base_user_id/$base_project_id/compare/") %>' + '<%= $base_branch %>...' + $(this).val();

         if (<%= $expand ? 1 : 0 %>) {

           href = href + '?expand=1';

         }

@@ -256,11 +275,11 @@

     <div>

       <div>

         <button id="base-branch-btn" class="btn btn-small">

-          <span>base:</span><b> <%= $from_rev %></b><i class="icon-arrow-down"></i>

+          <span>base:</span><b> <%= $base_branch %></b><i class="icon-arrow-down"></i>

         </button>

         ...

         <button id="compare-branch-btn" class="btn btn-small">

-          <span>compare:</span> <b><%= $rev %></b><i class="icon-arrow-down"></i>

+          <span>compare:</span> <b><%= $target_branch %></b><i class="icon-arrow-down"></i>

         </button>

         % if ($can_open_pull_request) {

@@ -297,7 +316,7 @@

             % my $branch = $branches->[$i];

               <li>

                 <a style="border-top-left-radius:0px;border-top-right-radius:0px;"

-                  href="<%= url_with("/$user_id/$project_id/compare/$branch->{name}...$rev") %>">

+                  href="<%= url_with("/$base_user_id/$base_project_id/compare/$branch->{name}...$target_branch") %>">

                   <%= $branch->{name} %>

                 </a>

               </li>

@@ -326,7 +345,7 @@

           % my $branch = $branches->[$i];

             <li>

               <a style="border-top-left-radius:0px;border-top-right-radius:0px;"

-                href="<%= url_with("/$user_id/$project_id/compare/$from_rev...$branch->{name}") %>">

+                href="<%= url_with("/$base_user_id/$base_project_id/compare/$base_branch...$branch->{name}") %>">

                 <%= $branch->{name} %>

               </a>

             </li>

@@ -397,12 +416,12 @@

                 </span>

               </div>

               <div class="compare-commits-commit-title">

-                <a style="color:#333" href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

+                <a style="color:#333" href="<%= url_for("/$base_user_id/$base_project_id/commit/$commit->{id}") %>">

                   <%= $commit->{title_short} %>

                 </a>

               </div>

               <div class="compare-commits-commit-id">

-                <a href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

+                <a href="<%= url_for("/$base_user_id/$base_project_id/commit/$commit->{id}") %>">

                   <%= substr($commit->{id}, 0, 7) %>

                 </a>

               </div>

@@ -420,9 +439,9 @@

       </div>

       <div>

         <b>

-          <%= $from_rev %></b> is up to date with all commits from

-          <b><%= $rev %></b>.

-          Try <a href="<%= url_for("/$user_id/$project_id/compare/$rev...$from_rev") %>">switching the base</a> for your comparison.

+          <%= $base_branch %></b> is up to date with all commits from

+          <b><%= $target_branch %></b>.

+          Try <a href="<%= url_for("/$base_user_id/$base_project_id/compare/$target_branch...$base_branch") %>">switching the base</a> for your comparison.

       </div>

     </div>

   % }

@@ -3,38 +3,67 @@

   my $api = gitprep_api;

   # Parameters

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

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

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

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

   my $row_id = param('row_id');

-  

-  # Session

-  my $session_user_id = $api->session_user_id;

-  

-  # Repository information

-  my $rep_info = app->rep_info($user_id, $project_id);

-  

-  # Working repository information

-  my $work_rep_info = app->work_rep_info($user_id, $project_id);

-  

-  # Git

-  my $git = $self->app->git;

   # Pull requests

   my $pull_request = app->dbi->model('pull_request')->select(

     [

       {__MY__ => '*'},

-      {user => ['id']}

+      {'pull_request__open_user' => ['id']}

     ],

     where => {'pull_request.row_id' => $row_id}

   )->one;

-  my $branch1 = $pull_request->{branch1};

-  my $branch2 = $pull_request->{branch2};

+  # Base information

+  my $base_project_row_id = $pull_request->{base_project};

+  my $base_project = app->dbi->model('project')->select(

+    [

+      {__MY__ => '*'},

+      {user => ['id']}

+    ],

+    where => {'project.row_id' => $base_project_row_id}

+  )->one;

+  my $base_branch = $pull_request->{base_branch};

+  

+  Carp::croak "pull_request invalid user id"

+    if $base_user_id ne $base_project->{'user.id'};

+  Carp::croak "pull_request invalid project id"

+    if $base_project_id ne $base_project->{id};

+  

+  # Target information

+  my $target_project_row_id = $pull_request->{target_project};

+  my $target_project = app->dbi->model('project')->select(

+    [

+      {__MY__ => '*'},

+      {user => ['id']}

+    ],

+    where => {'project.row_id' => $target_project_row_id}

+  )->one;

+  my $target_branch = $pull_request->{target_branch};

+  my $target_user_id = $target_project->{'user.id'};

+  my $taregt_project_id = $target_project->{id};

+  

+  # Session

+  my $session_user_id = $api->session_user_id;

+  

+  # Base repository information

+  my $base_rep_info = app->rep_info($base_user_id, $base_project_id);

+  

+  # Target repository information

+  my $target_rep_info = app->rep_info($target_user_id, $base_project_id);

+  

+  # Working repository information

+  my $work_rep_info = app->work_rep_info($base_user_id, $base_project_id);

+  

+  # Git

+  my $git = $self->app->git;

   if (lc $self->req->method eq 'post') {

     # Access controll

-    unless ($api->can_write_access($session_user_id, $user_id, $project_id)) {

+    unless ($api->can_write_access($session_user_id, $base_user_id, $base_project_id)) {

       $self->reply->exception('Forbbiden');

       return;

     }

@@ -69,38 +98,38 @@

       # Prepare merge

       $self->app->manager->prepare_merge(

         $work_rep_info,

-        $rep_info,

-        $branch1,

-        $rep_info,

-        $branch2

+        $base_rep_info,

+        $base_branch,

+        $target_rep_info,

+        $target_branch

       );

       # Merge

       my $merge_success = $self->app->manager->merge(

         $work_rep_info,

-        $rep_info,

-        $branch1,

-        $rep_info,

-        $branch2

+        $base_rep_info,

+        $base_branch,

+        $target_rep_info,

+        $target_branch

       );

       if ($merge_success) {

         # Push

-        app->manager->push($work_rep_info, $branch1);

+        app->manager->push($work_rep_info, $base_branch);

         app->dbi->model('pull_request')->update(

           {open => 0},

           where => {row_id => $row_id}

         );

-        $self->redirect_to("/$user_id/$project_id/tree/$branch1");

+        $self->redirect_to("/$base_user_id/$base_project_id/tree/$base_branch");

       }

     }

   }

   # Commits

-  my $commits = $git->forward_commits($rep_info, $branch1, $branch2);

+  my $commits = $git->forward_commits($base_rep_info, $base_branch, $target_branch);

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -113,10 +142,10 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit($rep_info, $branch1, $branch2);

+  my $start_commit = $git->separated_commit($base_rep_info, $base_branch, $target_branch);

   # End commit

-  my $end_commit = $git->get_commit($rep_info, $branch2);

+  my $end_commit = $git->get_commit($target_rep_info, $target_branch);

   # Pull request first message 

   my $pull_request_message_first = app->dbi->model('pull_request_message')->select(

@@ -129,26 +158,26 @@

   # Check merge automatically

   my $merge_success;

-  if ($api->can_write_access($session_user_id, $user_id, $project_id) && $pull_request->{open}) {

-  

+  if ($api->can_write_access($session_user_id, $base_user_id, $base_project_id) && $pull_request->{open}) {

+    

     my $lock_fh = $self->app->manager->lock_rep($work_rep_info);

     # Prepare merge

     $self->app->manager->prepare_merge(

       $work_rep_info,

-      $rep_info,

-      $branch1,

-      $rep_info,

-      $branch2

+      $base_rep_info,

+      $base_branch,

+      $target_rep_info,

+      $target_branch

     );

     # Check merge automatical

     $merge_success = $self->app->manager->merge(

       $work_rep_info,

-      $rep_info,

-      $branch1,

-      $rep_info,

-      $branch2

+      $base_rep_info,

+      $base_branch,

+      $target_rep_info,

+      $target_branch

     );

   }

@@ -161,7 +190,7 @@

   );

 %>

-% layout 'common', title => "Pull Requests Tags \x{30fb} $user_id/$project_id";

+% layout 'common', title => "Pull Requests Tags \x{30fb} $base_user_id/$base_project_id";

   %= include '/include/header';

@@ -187,17 +216,21 @@

           </div>

         % }

       </div>

-      % my $open_user_id = $pull_request->{'user.id'};

+      % my $open_user_id = $pull_request->{'pull_request__open_user.id'};

       <a style="color:#333333;font-weight:bold" href="<%= url_for("/$open_user_id") %>"><%= $open_user_id %></a> 

       <span style="color:#767676">

         wants to merge <%= $commits_count %> commits

         into

         <span style="display:inline-block;padding:2px 4px;background:#e8f0f8;color:#336479;border-radius:3px;">

-          <%= $pull_request->{branch1} %>

+          <%= $pull_request->{base_branch} %>

         </span>

         from

         <span style="display:inline-block;padding:2px 4px;background:#e8f0f8;color:#336479;border-radius:3px;">

-          <%= $pull_request->{branch2} %>

+          % if ($base_user_id ne $target_user_id) {

+            <%= $target_user_id %>

+            /

+          % }

+          <%= $pull_request->{target_branch} %>

         </span>

       </span>

     </div>

@@ -225,7 +258,7 @@

         </ul>

         <div class="pull-comment">

           <div class="pull-comment-header">

-            <b><%= $pull_request_message_first->{'user.id'} %></b>

+            <b><%= $pull_request_message_first->{'pull_request__open_user.id'} %></b>

             <span style="color:#767676">

               commented

               <%= $api->age_string($pull_request_message_first->{update_time}) %></b>

@@ -264,12 +297,12 @@

                     </span>

                   </div>

                   <div class="compare-commits-commit-title">

-                    <a style="color:#333" href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

+                    <a style="color:#333" href="<%= url_for("/$base_user_id/$base_project_id/commit/$commit->{id}") %>">

                       <%= $commit->{title_short} %>

                     </a>

                   </div>

                   <div class="compare-commits-commit-id">

-                    <a href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

+                    <a href="<%= url_for("/$base_user_id/$base_project_id/commit/$commit->{id}") %>">

                       <%= substr($commit->{id}, 0, 7) %>

                     </a>

                   </div>

@@ -283,7 +316,7 @@

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

       % }

-      % if ($api->can_write_access($session_user_id, $user_id, $project_id)) {

+      % if ($api->can_write_access($session_user_id, $base_user_id, $base_project_id)) {

         % if ($commits_count && $merge_success && $pull_request->{open}) {

           <form action="<%= url_for %>" method="post">

             <%= hidden_field op => 'merge' %>