Merge branch 'sh-revert-annotate-for-blame' into 'master'

Revert "Annotate" to "Blame"

See merge request !12401

app/assets/stylesheets/framework/files.scss

@@ -129,7 +129,7 @@
     }
     /**
-     *  Annotate file
+     *  Blame file
      */
     &.blame {
       table {

app/views/projects/blame/show.html.haml

 - @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 }

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),

features/steps/project/source/browse_files.rb

@@ -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

spec/features/projects/blobs/blob_line_permalink_updater_spec.rb

@@ -55,7 +55,7 @@ def visit_blob(fragment = nil)
       end
     end
-    describe 'Click "Annotate" button' do
+    describe 'Click "Blame" button' do
       it 'works with no initial line number fragment hash' do
         visit_blob

spec/features/projects/files/browse_files_spec.rb

@@ -12,7 +12,7 @@
   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"