diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 16:26:41 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 16:26:41 +0300 |
| commit | 89854139a4bcdd0cc16b67e7c49ec781aee70036 (patch) | |
| tree | a42d1944f5ab1d3cd250274ed90d27d6fe81403e /lib | |
| parent | 5a6850c416ee13d93841624c35f07587b6ab2d23 (diff) | |
| parent | 9a450aedc2c81f8ce17e4c9b4238c58edbef8269 (diff) | |
Merge branch 'asciidoc_inter_document_cross_references' into 'master'
Set Asciidoctor outfilesuffix to default .adoc
Closes #43192 and #17602
See merge request gitlab-org/gitlab-ce!17125
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/asciidoc.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index ee7f4be6b9f..62c41801d75 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -8,7 +8,8 @@ module Gitlab module Asciidoc DEFAULT_ADOC_ATTRS = [ 'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=gitlab', - 'env-gitlab', 'source-highlighter=html-pipeline', 'icons=font' + 'env-gitlab', 'source-highlighter=html-pipeline', 'icons=font', + 'outfilesuffix=.adoc' ].freeze # Public: Converts the provided Asciidoc markup into HTML. |