Commit 516a3b78 authored by Stan Hu's avatar Stan Hu

Revert "Annotate" to "Blame"

parent 5cd1a48d
Pipeline #9250881 passed with stages
in 99 minutes and 13 seconds
......@@ -123,7 +123,7 @@
}
/**
* Annotate file
* Blame file
*/
&.blame {
table {
......
- @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 }
......
......@@ -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),
......
---
title: Changed Blame to Annotate in the UI to promote blameless culture
merge_request: 10378
author: Ilya Vassilevsky
......@@ -369,7 +369,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
expect(page).to have_content 'Permalink'
expect(page).not_to have_content 'Edit'
expect(page).not_to have_content 'Blame'
expect(page).not_to have_content 'Annotate'
expect(page).to have_content 'Delete'
expect(page).to have_content 'Replace'
end
......
......@@ -55,7 +55,7 @@ feature 'Blob button line permalinks (BlobLinePermalinkUpdater)', feature: true,
end
end
describe 'Click "Annotate" button' do
describe 'Click "Blame" button' do
it 'works with no initial line number fragment hash' do
visit_blob
......
......@@ -12,7 +12,7 @@ feature 'user browses project', feature: true, js: true do
scenario "can see blame of '.gitignore'" do
click_link ".gitignore"
click_link 'Annotate'
click_link 'Blame'
expect(page).to have_content "*.rb"
expect(page).to have_content "Dmitriy Zaporozhets"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment