@@ -434,8 +434,8 @@ sub startup {

             $r->get('/pulls' => sub { shift->render_maybe('/pulls') })->to(tab => 'pulls');

             # Pull request

-            $r->get('/pull/(:row_id).patch' => sub { shift->render_maybe('/pull') })->to(tab => 'pulls', patch => 1);

-            $r->any('/pull/:row_id' => sub { shift->render_maybe('/pull') })->to(tab => 'pulls');

+            $r->get('/pull/(:number).patch' => sub { shift->render_maybe('/pull') })->to(tab => 'pulls', patch => 1);

+            $r->any('/pull/:number' => sub { shift->render_maybe('/pull') })->to(tab => 'pulls');

             # Commit

             $r->get('/commit/*diff' => sub { shift->render_maybe('/commit') });

@@ -91,14 +91,14 @@

           $issue = app->dbi->model('issue')->select(

             where => {pull_request => $pull_request->{row_id}}

           )->one;

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

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

           return;

         }

         else {

           my $now_tm = Time::Moment->now_utc;

           my $now_epoch = $now_tm->epoch;

           my $session_user_row_id = $api->session_user_row_id;

-          my $new_issue_row_id;

+          my $issue_number;

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

             # New pull request

@@ -109,19 +109,30 @@

               target_branch => $target_branch,

             };

+            # last pull request row id

             app->dbi->model('pull_request')->insert($new_pull_request);

             my $new_pull_request_row_id = app->dbi->execute("select LAST_INSERT_ROWID()")->value;

+            # issue number

+            $issue_number = app->dbi->model('issue')->select(

+              'max(number)',

+              where => {project => $project_row_id},

+              append => 'group by project'

+            )->value;

+            $issue_number++;

+            

             # New issue

             my $new_issue = {

               title => $title,

               open => 1,

               open_time => $now_epoch,

               open_user => $session_user_row_id,

-              pull_request => $new_pull_request_row_id

+              pull_request => $new_pull_request_row_id,

+              project => $project_row_id,

+              number => $issue_number

             };

             app->dbi->model('issue')->insert($new_issue);

-            $new_issue_row_id = app->dbi->execute("select LAST_INSERT_ROWID()")->value;

+            my $new_issue_row_id = app->dbi->execute("select LAST_INSERT_ROWID()")->value;

             # New issue message

             my $new_issue_message = {

@@ -136,7 +147,7 @@

             app->dbi->model('issue_message')->insert($new_issue_message);

           });

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

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

           return;

         }

       }

@@ -5,7 +5,7 @@

   # Parameters

   my $base_user_id = param('user');

   my $base_project_id = param('project');

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

+  my $issue_number = param('number');

   # Issue

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

@@ -13,7 +13,10 @@

       {__MY__ => '*'},

       {open_user => ['id']}

     ],

-    where => {'issue.row_id' => $row_id}

+    where => {

+      'project.id' => $base_project_id,

+      'issue.number' => $issue_number

+    }

   )->one;

   # Pull requests

@@ -105,10 +108,12 @@

     if ($op eq 'close') {

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

         {

-          open => 0,

-          open_user => $session_user_row_id

+          open => 0

         },

-        where => {row_id => $row_id}

+        where => {

+          'project.id' => $base_project_id,

+          'issue.number' => $issue_number

+        }

       );

       $self->redirect_to('current');

       return;

@@ -121,7 +126,10 @@

           open_time => $open_time,

           open_user => $session_user_row_id

         },

-        where => {row_id => $row_id}

+        where => {

+          'project.id' => $base_project_id,

+          'issue.number' => $issue_number

+        }

       );

       $self->redirect_to('current');

       return;

@@ -152,11 +160,15 @@

         # Push

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

+        # Close

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

           {

             open => 0

           },

-          where => {row_id => $row_id}

+          where => {

+            'project.id' => $base_project_id,

+            'issue.number' => $issue_number

+          }

         );

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

@@ -189,7 +201,7 @@

       {__MY__ => '*'},

       {user => ['id']}

     ],

-    where => {issue => $row_id, number => 1}

+    where => {issue => $issue->{row_id}, number => 1}

   )->one;

   # Check merge automatically

@@ -229,7 +241,7 @@

   my $ssh_rep_url = "ssh://$execute_user\@" . $url->host

     . ($ssh_port ? ":$ssh_port" : '') . "$ssh_rep_url_base/$user/$project.git";

-  my $patch_url = url_for("/$base_user_id/$base_project_id/pull/$issue->{row_id}.patch")->to_abs;

+  my $patch_url = url_for("/$base_user_id/$base_project_id/pull/$issue->{number}.patch")->to_abs;

   my $pre_content_base = "git checkout -b $target_user_id-$target_branch $base_branch";

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

@@ -256,7 +268,7 @@

         $pull_title = ucfirst $pull_title;

       %>

-      <%= $pull_title %> <span style="color:#767676;">#<%= $issue->{row_id} %></span>

+      <%= $pull_title %> <span style="color:#767676;">#<%= $issue->{number} %></span>

     </div>

     <div>

       <div style="display:inline-block;color:white;margin-right:4px;">

@@ -78,12 +78,12 @@

               %>

               <li>

                 <div class="pulls-title">

-                  <a href="<%= "/$user_id/$project_id/pull/$issue->{row_id}" %>">

+                  <a href="<%= "/$user_id/$project_id/pull/$issue->{number}" %>">

                     <b><%= $issue->{title} %></b>

                   </a>

                 </div>

                 <div class="pulls-description">

-                  #<%= $issue->{row_id} %> <%= $issue->{open} ? 'opened' : 'closed' %>

+                  #<%= $issue->{number} %> <%= $issue->{open} ? 'opened' : 'closed' %>

                   <%= $open_time_age_string %>

                   by <%= $issue->{'open_user.id'} %>

                 </div>