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

Revert "Annotate" to "Blame"

See merge request !12401
This commit is contained in:
Rémy Coutable 2017-06-26 14:10:44 +00:00
commit dfc8542649
6 changed files with 5 additions and 6 deletions

View file

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

View file

@ -1,6 +1,6 @@
- @no_container = true - @no_container = true
- project_duration = age_map_duration(@blame_groups, @project) - project_duration = age_map_duration(@blame_groups, @project)
- page_title "Annotate", @blob.path, @ref - page_title "Blame", @blob.path, @ref
= render "projects/commits/head" = render "projects/commits/head"
%div{ class: container_class } %div{ class: container_class }

View file

@ -27,7 +27,7 @@
= link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id), = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id),
class: 'btn' class: 'btn'
- else - 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? class: 'btn js-blob-blame-link' unless blob.empty?
= link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id),

View file

@ -369,7 +369,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
expect(page).to have_content 'Permalink' expect(page).to have_content 'Permalink'
expect(page).not_to have_content 'Edit' expect(page).not_to have_content 'Edit'
expect(page).not_to have_content 'Blame' 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 'Delete'
expect(page).to have_content 'Replace' expect(page).to have_content 'Replace'
end end

View file

@ -55,7 +55,7 @@ feature 'Blob button line permalinks (BlobLinePermalinkUpdater)', feature: true,
end end
end end
describe 'Click "Annotate" button' do describe 'Click "Blame" button' do
it 'works with no initial line number fragment hash' do it 'works with no initial line number fragment hash' do
visit_blob visit_blob

View file

@ -12,7 +12,7 @@ feature 'user browses project', feature: true, js: true do
scenario "can see blame of '.gitignore'" do scenario "can see blame of '.gitignore'" do
click_link ".gitignore" click_link ".gitignore"
click_link 'Annotate' click_link 'Blame'
expect(page).to have_content "*.rb" expect(page).to have_content "*.rb"
expect(page).to have_content "Dmitriy Zaporozhets" expect(page).to have_content "Dmitriy Zaporozhets"