GitPrep
Login
Showing 11 changed files with 17 additions and 17 deletions
+1 -1
lib/Gitprep/Git.pm
View
... ... 
@@ -227,7 +227,7 @@ sub blame {
227 227 
         $blame_line->{author} = $1;
228 228 
       }
229 229 
       elsif ($line =~ /^author-mail +(.+)/) {
230 
-        $blame_line->{author_mail} = $1;
230 
+        $blame_line->{author_email} = $1;
231 231 
       }
232 232 
       elsif ($line =~ /^author-time +(.+)/) {
233 233 
         my $author_time = $1;
+1 -1
templates/auto/_admin/users.html.ep
View
... ... 
@@ -111,7 +111,7 @@
111 111 
               <%= $user->{name} %>
112 112 
             </td>
113 113 
             <td>
114 
-              <%= $user->{mail} %>
114 
+              <%= $user->{email} %>
115 115 
             </td>
116 116 
             <td>
117 117 
               <a class="btn btn-small" href="<%= url_for('/_admin/user/update')->query(id => $uid) %>">Settings</a>
+1 -1
templates/blame.html.ep
View
... ... 
@@ -116,7 +116,7 @@
116 116 
                   </div>
117 117 
                 </div>
118 118 
                 <div class="blame-author">
119 
-                  <span title="<%= $line->{author_mail} %>"><%= $line->{author} %></span>
119 
+                  <span title="<%= $line->{author_email} %>"><%= $line->{author} %></span>
120 120 
                   authored on
121 121 
                   <%= $line->{author_age_string_date_local} %>
122 122 
                 </div>
+2 -2
templates/blob.html.ep
View
... ... 
@@ -15,10 +15,10 @@
15 15
16 16 
   # Commit
17 17 
   my $commit = $git->last_change_commit(app->rep_info($user, $project), $rev, $file);
18 
-  my $commit_author_mail = $commit->{author_email};
18 
+  my $commit_author_email = $commit->{author_email};
19 19 
   my $commit_author_id = app->dbi->model('user')->select(
20 20 
     'id',
21 
-    where => {mail => $commit_author_mail}
21 
+    where => {email => $commit_author_email}
22 22 
   )->value;
23 23
24 24 
   # Authors
+1 -1
templates/branches.html.ep
View
... ... 
@@ -212,7 +212,7 @@
212 212 
                 my $commit_author_mail = $branch->{commit}{author_email};
213 213 
                 my $commit_author_id = app->dbi->model('user')->select(
214 214 
                   'id',
215 
-                  where => {mail => $commit_author_mail}
215 
+                  where => {email => $commit_author_email}
216 216 
                 )->value;
217 217
218 218 
               %>
+2 -2
templates/commit.html.ep
View
... ... 
@@ -26,10 +26,10 @@
26 26 
   $commit->{committer_date} = $git->timestamp($committer_date);
27 27 
   $from_rev = $commit->{parent} unless defined $from_rev;
28 28 
   my $commit_short_id = substr($commit->{id}, 0, 7, );
29 
-  my $commit_author_mail = $commit->{author_email};
29 
+  my $commit_author_email = $commit->{author_email};
30 30 
   my $commit_author_id = app->dbi->model('user')->select(
31 31 
     'id',
32 
-    where => {mail => $commit_author_mail}
32 
+    where => {email => $commit_author_email}
33 33 
   )->value;
34 34
35 35 
   # Branches
+2 -2
templates/commits.html.ep
View
... ... 
@@ -23,10 +23,10 @@
23 23 
     $self->reply->not_found;
24 24 
     return;
25 25 
   }
26 
-  my $commit_author_mail = $commit->{author_email};
26 
+  my $commit_author_email = $commit->{author_email};
27 27 
   my $commit_author_id = app->dbi->model('user')->select(
28 28 
     'id',
29 
-    where => {mail => $commit_author_mail}
29 
+    where => {email => $commit_author_email}
30 30 
   )->value;
31 31
32 32 
   # Commits
+2 -2
templates/compare.html.ep
View
... ... 
@@ -349,10 +349,10 @@
349 349 
         <ul class="compare-commits-date-container">
350 350 
           % for my $commit (sort {$b->{author_epoch} <=> $a->{author_epoch}} @$commits) {
351 351 
             <%
352 
-              my $commit_author_mail = $commit->{author_email};
352 
+              my $commit_author_email = $commit->{author_email};
353 353 
               my $commit_author_id = app->dbi->model('user')->select(
354 354 
                 'id',
355 
-                where => {mail => $commit_author_mail}
355 
+                where => {email => $commit_author_email}
356 356 
               )->value;
357 357 
             %>
358 358 
             <li>
+2 -2
templates/include/tree.html.ep
View
... ... 
@@ -1,9 +1,9 @@
1 1 
 <%
2 2 
   my $dir = stash('dir');
3 
-  my $commit_author_mail = $commit->{author_email};
3 
+  my $commit_author_email = $commit->{author_email};
4 4 
   my $commit_author_id = app->dbi->model('user')->select(
5 5 
     'id',
6 
-    where => {mail => $commit_author_mail}
6 
+    where => {email => $commit_author_email}
7 7 
   )->value;
8 8 
 %>
9 9
+2 -2
templates/pull.html.ep
View
... ... 
@@ -113,10 +113,10 @@
113 113 
           <ul class="compare-commits-date-container">
114 114 
             % for my $commit (sort {$b->{author_epoch} <=> $a->{author_epoch}} @$commits) {
115 115 
               <%
116 
-                my $commit_author_mail = $commit->{author_email};
116 
+                my $commit_author_email = $commit->{author_email};
117 117 
                 my $commit_author_id = app->dbi->model('user')->select(
118 118 
                   'id',
119 
-                  where => {mail => $commit_author_mail}
119 
+                  where => {email => $commit_author_email}
120 120 
                 )->value;
121 121 
               %>
122 122 
               <li>
+1 -1
templates/user.html.ep
View
... ... 
@@ -46,7 +46,7 @@
46 46 
           % }
47 47 
         </div>
48 48 
         <div class="repositories-user-id"><%= $user->{id} %></div>
49 
-        <div class="repositories-user-mail"><i class="icon icon-envelope"></i> <a href="mailto:<%= $user->{mail} %>"><%= $user->{mail} %></a></div>
49 
+        <div class="repositories-user-mail"><i class="icon icon-envelope"></i> <a href="mailto:<%= $user->{email} %>"><%= $user->{email} %></a></div>
50 50 
       </div>
51 51 
       <div class="repositories-right">
52 52 
         <div class="topic1">Repositories</div>
Gitprep Version v2.6_dev build on Mojolicious