diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-27 14:54:20 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-27 14:54:20 -0500 |
| commit | bb7865276bb9adfe34755c3ea358e4951ec37d6f (patch) | |
| tree | 6e0b313177dbc1c924684b260c79cd0b34b15020 | |
| parent | b6566277be7ef91cd998f48a229e1e95d01397f3 (diff) | |
| download | gitlab-ce-dm-blob-viewers.tar.gz | |
Use new renamed markup methoddm-blob-viewers
| -rw-r--r-- | app/views/projects/blob/viewers/_markup.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/copy_as_gfm_spec.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/blob/viewers/_markup.html.haml b/app/views/projects/blob/viewers/_markup.html.haml index ae8f3e05687..b9a998d96ff 100644 --- a/app/views/projects/blob/viewers/_markup.html.haml +++ b/app/views/projects/blob/viewers/_markup.html.haml @@ -1,3 +1,3 @@ - blob = viewer.blob .file-content.wiki - = render_markup(blob.name, blob.data) + = markup(blob.name, blob.data) diff --git a/spec/features/copy_as_gfm_spec.rb b/spec/features/copy_as_gfm_spec.rb index 344e31e5ef5..f197fb44608 100644 --- a/spec/features/copy_as_gfm_spec.rb +++ b/spec/features/copy_as_gfm_spec.rb @@ -479,6 +479,7 @@ describe 'Copy as GFM', feature: true, js: true do context 'from a blob' do before do visit namespace_project_blob_path(project.namespace, project, File.join('master', 'files/ruby/popen.rb')) + wait_for_ajax end context 'selecting one word of text' do @@ -520,6 +521,7 @@ describe 'Copy as GFM', feature: true, js: true do context 'from a GFM code block' do before do visit namespace_project_blob_path(project.namespace, project, File.join('markdown', 'doc/api/users.md')) + wait_for_ajax end context 'selecting one word of text' do |