@@ -20,14 +20,24 @@ sub admin_user {

 }

 sub default_branch {

-  my ($self, $user, $project) = @_;

-  

-  # Default branch

-  my $default_branch = $self->app->dbi->model('project')

-    ->select('default_branch', id => [$user, $project])

-    ->value;

+  my ($self, $user, $project, $default_branch) = @_;

-  return $default_branch;

+  # Set default branch

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

+  if (defined $default_branch) {

+    $dbi->model('project')->update(

+      {default_branch => $default_branch},

+      id => [$user, $project]

+    );

+  }

+  else {

+    # Get default branch

+    my $default_branch = $dbi->model('project')

+      ->select('default_branch', id => [$user, $project])

+      ->value;

+    

+    return $default_branch;

+  }

 }

 sub fork_project {

@@ -542,8 +552,6 @@ sub exists_project {

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

   my $row = $dbi->model('project')->select(id => [$user, $project])->one;

-  use D;d $row;

-  

   return $row ? 1 : 0;

 }

@@ -68,7 +68,7 @@

     eval { $git->description($user, $project, $description) };

     if ($@) {

-      app->log->error("/settings?op=change-description: $@");

+      app->log->error("/$user/$project/settings?op=description: $@");

       $errors = ['Internal Error'];

     }

     else {

@@ -79,6 +79,22 @@

     }

   }

+  # Change default branch

+  elsif ($op eq 'default-branch' && $post) {

+    my $default_branch = param('default-branch');

+    eval { app->manager->default_branch($user, $project, $default_branch) };

+    if ($@) {

+      app->log->error("/$user/$project/settings?op=default-branch: $@");

+      $errors = ['Internal Error'];

+    }

+    else {

+      flash(message => "Default branch is changed to $default_branch.");

+      $self->redirect_to('current');

+      $self->finish_rendering;

+      return;

+    }

+  }

+  

   # Delete project

   elsif ($op eq 'delete-project' && $post) {

@@ -128,6 +144,11 @@

         $('#form-rename-project').submit();

       });

+      // Select default branch

+      $('[name=default-branch]').on('change', function () {

+        $('#form-default-branch').submit();

+      });

+

       // Check matching deleted project

       $('input[name="deleted-project"]').on('keyup', function () {

         var deleted_project = $(this).val();

@@ -142,7 +163,7 @@

             .attr('disabled', 'disabled');

         }

       });

-      

+            

       // Delete project

       $('#delete').on('click', function () {

         var deleted_project = $('input[name="deleted-project"]').val();

@@ -163,10 +184,6 @@

           }

         });

       });

-      

-      // Select default branch

-      var default_branch = "<%= app->manager->default_branch($user, $project) %>";

-      $('select[name="default_branch"]').val(default_branch);

     });

   % end

@@ -207,11 +224,15 @@

         </form>

       </div>

       <div class="border-gray" style="padding:5px;border-top:none">

-        Default Branch

-        % my $branches = $git->branches($user, $project);

-        % my $branch_names = [map { $_->{name} } @$branches];

-        % push @$branch_names, app->manager->default_branch($user, $project) unless @$branch_names;

-        %= select_field 'default_branch' => $branch_names, style => 'margin-top:5px';

+        <form id="form-default-branch" action="<%= url_for->query(op => 'default-branch') %>" method="post" style="margin-bottom:0px">

+          Default Branch

+          % my $branches = $git->branches($user, $project);

+          % my $branch_names = [map { $_->{name} } @$branches];

+          % my $default_branch = app->manager->default_branch($user, $project);

+          % push @$branch_names,  unless @$branch_names;

+          % param('default-branch', $default_branch);

+          %= select_field 'default-branch' => $branch_names, style => 'margin-top:5px';

+        </form>

       </div>

     </div>