diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-02 14:40:11 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-02 14:40:11 +0000 |
| commit | 31b3417b7981150726a9329c9dd5ce5a4542157d (patch) | |
| tree | d2db1d3044bc546c9f390cf8b816215db275767a /features | |
| parent | dab266219441144a74b86fa27f4e0528810482d1 (diff) | |
| parent | 3801dc0e6e245929ba7140cc8e69154f64f1a669 (diff) | |
| download | gitlab-ce-31b3417b7981150726a9329c9dd5ce5a4542157d.tar.gz | |
Merge branch 'blameless' into 'master'
Promote blameless culture by using "annotate" instead
See merge request !10378
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 6efd4374b32..d099d7af167 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -372,6 +372,7 @@ 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 |