diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2016-10-30 16:41:13 -0500 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2017-06-14 09:17:26 -0500 |
| commit | 477d975a6786c00b642fe273e36061a94c39225b (patch) | |
| tree | b5b85d7c04a9464c79375ef94e9aa62ff137132f /app/views/projects | |
| parent | a1695253215534539ea17794a8696212c5454b82 (diff) | |
| download | gitlab-ce-477d975a6786c00b642fe273e36061a94c39225b.tar.gz | |
Add blame view age map
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/blame/_age_map_legend.html.haml | 12 | ||||
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app/views/projects/blame/_age_map_legend.html.haml b/app/views/projects/blame/_age_map_legend.html.haml new file mode 100644 index 00000000000..533dc20ffb3 --- /dev/null +++ b/app/views/projects/blame/_age_map_legend.html.haml @@ -0,0 +1,12 @@ +%span.left-label Newer +%span.legend-box.legend-box-0 +%span.legend-box.legend-box-1 +%span.legend-box.legend-box-2 +%span.legend-box.legend-box-3 +%span.legend-box.legend-box-4 +%span.legend-box.legend-box-5 +%span.legend-box.legend-box-6 +%span.legend-box.legend-box-7 +%span.legend-box.legend-box-8 +%span.legend-box.legend-box-9 +%span.right-label Older diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index a6ee2b2f7b8..ce937ee1842 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -1,4 +1,5 @@ - @no_container = true +- project_duration = age_map_duration(@blame_groups, @project) - page_title "Annotate", @blob.path, @ref = render "projects/commits/head" @@ -8,15 +9,16 @@ .file-holder = render "projects/blob/header", blob: @blob, blame: true - + .file-blame-legend + = render 'age_map_legend' .table-responsive.file-content.blame.code.js-syntax-highlight %table - current_line = 1 - @blame_groups.each do |blame_group| %tr - %td.blame-commit + - commit = blame_group[:commit] + %td.blame-commit{ class: age_map_class(commit.committed_date, project_duration) } .commit - - commit = blame_group[:commit] = author_avatar(commit, size: 36) .commit-row-title %strong |