diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-26 17:10:44 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 22:05:15 +0300 |
| commit | 571f07dc074543b079385d18ec94404a365be0a9 (patch) | |
| tree | 4013c9c9b1e385fec0d7245df0a3bdf7b403835e /app | |
| parent | 42fac10d77f7b5a7dbad2febf1e1b7d5e95ab407 (diff) | |
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame"
See merge request !12401
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 d08df05fd6c..78f425057eb 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -85,7 +85,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 a6ee2b2f7b8..a2ec3d44185 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- 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 0ad9f258e48..3f58e8d232f 100644 --- a/app/views/projects/blob/_breadcrumb.html.haml +++ b/app/views/projects/blob/_breadcrumb.html.haml @@ -10,7 +10,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), |