diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-02 17:40:11 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-02 17:40:11 +0300 |
| commit | 31b3417b7981150726a9329c9dd5ce5a4542157d (patch) | |
| tree | d2db1d3044bc546c9f390cf8b816215db275767a /app | |
| parent | dab266219441144a74b86fa27f4e0528810482d1 (diff) | |
| parent | 3801dc0e6e245929ba7140cc8e69154f64f1a669 (diff) | |
Merge branch 'blameless' into 'master'
Promote blameless culture by using "annotate" instead
See merge request !10378
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 78f425057eb..d08df05fd6c 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -85,7 +85,7 @@ } /** - * Blame file + * Annotate file */ &.blame { table { diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index a2ec3d44185..a6ee2b2f7b8 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 "Blame", @blob.path, @ref +- page_title "Annotate", @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 3f58e8d232f..0ad9f258e48 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 'Blame', namespace_project_blame_path(@project.namespace, @project, @id), + = link_to 'Annotate', 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), |