Showing 1 changed files with 7 additions and 8 deletions
+7 -8
templates/pull.html.ep
... ...
@@ -43,7 +43,7 @@
43 43
   )->one;
44 44
   my $target_branch = $pull_request->{target_branch};
45 45
   my $target_user_id = $target_project->{'__user.id'};
46
-  my $taregt_project_id = $target_project->{id};
46
+  my $target_project_id = $target_project->{id};
47 47
   
48 48
   # Session
49 49
   my $session_user_row_id = $api->session_user_row_id;
... ...
@@ -358,8 +358,7 @@
358 358
                     If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.
359 359
                   </div>
360 360
                   <div style="margin-top:10px">
361
-                    <button>HTTPS</button> <button>Git</button> <button>Patch</button>
362
-                    <%= text_field clone_url => "https://github.com/kaloyan13/gitprep.git" %>
361
+                    <button class="btn btn-small" style="border-radius:3px 0 0 3px">HTTPS</button><button class="btn btn-small" style="border-radius:0">Git</button><button class="btn btn-small" style="border-radius:0">Patch</button><%= text_field clone_url => "https://github.com/kaloyan13/gitprep.git", style => "width:600px;padding:4px 7px 5px 7px;border-radius:0 3px 3px 0" %>
363 362
                   </div>
364 363
 
365 364
                   <div style="margin-top:15px;margin-bottom:5px;">
... ...
@@ -367,8 +366,8 @@
367 366
                   </div>
368 367
 
369 368
 <pre style="background:#f2f2f2; padding:10px; border-radius:3px">
370
-git checkout -b kaloyan13-master master
371
-git pull https://github.com/kaloyan13/gitprep.git master
369
+git checkout -b <%= $target_user_id %>-<%= $target_branch %> <%= $base_branch %>
370
+git pull <%= url_for("$target_user_id/$target_project_id.git")->to_abs %> <%= $target_branch %>
372 371
 </pre>
373 372
 
374 373
                   <div style="margin-top:15px;margin-bottom:5px;">
... ...
@@ -376,9 +375,9 @@ git pull https://github.com/kaloyan13/gitprep.git master
376 375
                   </div>
377 376
 
378 377
 <pre style="background:#f2f2f2; padding:10px; border-radius:3px">
379
-git checkout master
380
-git merge --no-ff kaloyan13-master
381
-git push origin master
378
+git checkout <%= $base_branch %>
379
+git merge --no-ff <%= $target_user_id %>-<%= $target_branch %>
380
+git push origin <%= $base_branch %>
382 381
 </pre>
383 382
                 </div>
384 383
               </div>