diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:10:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:10:44 +0000 |
| commit | dfc85426493fdd9848e4f321e436d439608682cc (patch) | |
| tree | a95896e039f35d0d0aea7687ffce92859acf463d /features | |
| parent | 47face017562b160dba2c9bb5d7b9e75f605f721 (diff) | |
| parent | 516a3b788078b9296a86bfa6b8d3160ea742f851 (diff) | |
| download | gitlab-ce-dfc85426493fdd9848e4f321e436d439608682cc.tar.gz | |
Merge branch 'sh-revert-annotate-for-blame' into 'master'
Revert "Annotate" to "Blame"
See merge request !12401
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 1 |
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 |