Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-26 17:10:44 +0300
committerClement Ho <ClemMakesApps@gmail.com>2017-06-27 22:05:15 +0300
commit571f07dc074543b079385d18ec94404a365be0a9 (patch)
tree4013c9c9b1e385fec0d7245df0a3bdf7b403835e /features/steps
parent42fac10d77f7b5a7dbad2febf1e1b7d5e95ab407 (diff)
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame" See merge request !12401
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/source/browse_files.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 80aa3a047a0..9ed4f8ea1f9 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/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