@@ -438,13 +438,14 @@ sub head_id {

 };

 sub no_merged_branches {

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

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

   # Command "git branch --no-merged"

-  my @cmd = ($self->cmd($project), 'branch', '--no-merged');

+  my @cmd = $self->_cmd($user, $project, 'branch', '--no-merged');

   open my $fh, '-|', @cmd or return;

-  my @branch_names = map { s/^\*//; s/^\s*//; s/\s*$//; $self->dec($_) } <$fh>;

+  my @branch_names

+    = map { s/^\*//; s/^\s*//; s/\s*$//; $self->dec($_) } <$fh>;

   close $fh or croak qq/Can't open "git branch"/;

   # Branches

@@ -726,14 +727,19 @@ sub tag {

 }

 sub tags {

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

-  

-  # Get tags (command "git for-each-ref")

-  my @cmd = ($self->cmd($project), 'for-each-ref',

-    ($limit ? '--count='.($limit+1) : ()), '--sort=-creatordate',

-    '--format=%(objectname) %(objecttype) %(refname) '.

-    '%(*objectname) %(*objecttype) %(subject)%00%(creator)',

-    'refs/tags');

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

+  

+  # Get tags

+  my @cmd = $self->_cmd(

+    $user,

+    $project,

+    'for-each-ref',

+    ($limit ? '--count='.($limit+1) : ()),

+    '--sort=-creatordate',

+    '--format=%(objectname) %(objecttype) %(refname) '

+      . '%(*objectname) %(*objecttype) %(subject)%00%(creator)',

+    'refs/tags'

+  );

   open my $fh, '-|', @cmd or return;

   # Parse Tags

@@ -1,15 +1,10 @@

 <%

-  use Gitprep::API;

-  

   # API

-  my $api = Gitprep::API->new($self);

+  my $api = gitprep_api;

   # Parameters

   my $user = param('user');

   my $project = param('project');

-  my $root_ns = $api->root_ns(config->{root});

-  my $rep_ns = "$root_ns/$user/$project.git";

-  my $rep = "/$rep_ns";

   # Git

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

@@ -17,10 +12,10 @@

   # Default branch

   my $default_branch = {};

   $default_branch->{name} = 'master';

-  $default_branch->{commit} = $git->parse_commit($rep, $default_branch->{name});

+  $default_branch->{commit} = $git->parse_commit($user, $project, $default_branch->{name});

   # No merged branches

-  my $branches  = $git->no_merged_branches($rep);

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

 %>

 % layout 'common';

@@ -5,17 +5,14 @@

   # Parameters

   my $user = param('user');

   my $project = param('project');

-  my $root_ns = $api->root_ns(config->{root});

-  my $rep_ns = "$root_ns/$user/$project.git";

-  my $rep = "/$rep_ns";

   # Git

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

   # Ref names

-  my $tags  = $git->tags($rep);

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

   for my $tag (@$tags) {

-    $tag->{commit} = $git->parse_commit($rep, $tag->{name});

+    $tag->{commit} = $git->parse_commit($user, $project, $tag->{name});

   }

 %>