diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:42:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:42:29 +0000 |
| commit | 262c6f11fee407350b8945501279a591d35ccb85 (patch) | |
| tree | b2ddab6fd5e13f73f0c65e154e46d3d30d2f0e7b /spec | |
| parent | c9920c422d55680310cffcf34432d708de4bf207 (diff) | |
| parent | 907860ed3d6f1a9865026b3028c48c69b1b591ee (diff) | |
| download | gitlab-ce-262c6f11fee407350b8945501279a591d35ccb85.tar.gz | |
Merge branch 'rs-remove-gfm_with_options' into 'master'
Remove the `gfm_with_options` helper
It was redundant because `gfm` also took options.
See merge request !1152
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/markdown_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb index 859a62f740f..3da4dfc2b23 100644 --- a/spec/features/markdown_spec.rb +++ b/spec/features/markdown_spec.rb @@ -15,7 +15,7 @@ require 'erb' # -> `markdown` helper # -> Redcarpet::Render::GitlabHTML converts Markdown to HTML # -> Post-process HTML -# -> `gfm_with_options` helper +# -> `gfm` helper # -> HTML::Pipeline # -> SanitizationFilter # -> Other filters, depending on pipeline @@ -179,7 +179,7 @@ describe 'GitLab Markdown', feature: true do before(:all) do @feat = MarkdownFeature.new - # `gfm_with_options` depends on a `@project` variable + # `gfm` helper depends on a `@project` variable @project = @feat.project @html = markdown(@feat.raw_markdown) |