diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-22 17:07:19 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-22 17:07:19 -0700 |
| commit | 516a3b788078b9296a86bfa6b8d3160ea742f851 (patch) | |
| tree | ad45ec7ad9bcf3c4c636dbb26858dc5aee99e918 /app | |
| parent | 5cd1a48d5e1b020770cb105eb946ff2936e2136a (diff) | |
| download | gitlab-ce-sh-revert-annotate-for-blame.tar.gz | |
Revert "Annotate" to "Blame"sh-revert-annotate-for-blame
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_breadcrumb.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index da03e4f5b5e..f9f0e60bcb5 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -123,7 +123,7 @@ } /** - * Annotate file + * Blame file */ &.blame { table { 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), |