diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:10:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:10:44 +0000 |
| commit | dfc85426493fdd9848e4f321e436d439608682cc (patch) | |
| tree | a95896e039f35d0d0aea7687ffce92859acf463d /app/views/projects | |
| parent | 47face017562b160dba2c9bb5d7b9e75f605f721 (diff) | |
| parent | 516a3b788078b9296a86bfa6b8d3160ea742f851 (diff) | |
| download | gitlab-ce-dfc85426493fdd9848e4f321e436d439608682cc.tar.gz | |
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame"
See merge request !12401
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_breadcrumb.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index ce937ee1842..3627f72f5e1 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -1,6 +1,6 @@ - @no_container = true - project_duration = age_map_duration(@blame_groups, @project) -- page_title "Annotate", @blob.path, @ref +- page_title "Blame", @blob.path, @ref = render "projects/commits/head" %div{ class: container_class } diff --git a/app/views/projects/blob/_breadcrumb.html.haml b/app/views/projects/blob/_breadcrumb.html.haml index 5840e9863f4..2c944b516a4 100644 --- a/app/views/projects/blob/_breadcrumb.html.haml +++ b/app/views/projects/blob/_breadcrumb.html.haml @@ -27,7 +27,7 @@ = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id), class: 'btn' - else - = link_to 'Annotate', namespace_project_blame_path(@project.namespace, @project, @id), + = link_to 'Blame', namespace_project_blame_path(@project.namespace, @project, @id), class: 'btn js-blob-blame-link' unless blob.empty? = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), |