diff --git a/Gemfile b/Gemfile index bf3209486a7502f87cdcf822bb667bcd7680fa2d..b8cfb9ed6df16230a009165f099b26f1018ec395 100644 --- a/Gemfile +++ b/Gemfile @@ -256,7 +256,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false # rubocop:todo Gemfile/Miss gem 'rouge', '~> 4.3.0', feature_category: :shared gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.17', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.19', feature_category: :team_planning # Calendar rendering gem 'icalendar', '~> 2.10.1', feature_category: :system_access diff --git a/Gemfile.checksum b/Gemfile.checksum index c1173def318daaf3fd1b73a26dd00dfa1ccfcba9..5289e01311995a6cfced5d9fca35b5eb3e2b60cb 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -213,11 +213,11 @@ {"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"}, {"name":"gitlab-experiment","version":"0.9.1","platform":"ruby","checksum":"f230ee742154805a755d5f2539dc44d93cdff08c5bbbb7656018d61f93d01f48"}, {"name":"gitlab-fog-azure-rm","version":"2.1.0","platform":"ruby","checksum":"f5becd9e412a8c8f18f8ac061b8bc2562a354fb7a9f63d8cc1b301e6e6aa0bdd"}, -{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"aarch64-linux","checksum":"81ccfd91c7a1da4b165e700f1a6fbb15cf20ffd283ec8c6e05d5e2078a569717"}, -{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"arm64-darwin","checksum":"2f9da51bb0e57ca431fe957e384c385c4380127a9a22ff3cbf7e0c67efb35897"}, -{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"ruby","checksum":"f379545fc53a71c31525025fdb422f46081133af5cced3130ce680b155c2aa69"}, -{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"x86_64-darwin","checksum":"50e0f4865ef7c455426c7c058fc10ff9c8366482d48a63d6f6693b38c4a49c1c"}, -{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"x86_64-linux","checksum":"cc877ff8ceb3aa8a331fdb8991592e35897823e0f77ba9e4b2b65082c665089b"}, +{"name":"gitlab-glfm-markdown","version":"0.0.19","platform":"aarch64-linux","checksum":"7cc4272cddb60c62745ac01e90368f1f11a5efbe8308a6df466eb3cca00b2c1a"}, +{"name":"gitlab-glfm-markdown","version":"0.0.19","platform":"arm64-darwin","checksum":"1aef2fe4ec251fdd00fe19c163f6ce94111128edd61623e7123b67bac0c74aed"}, +{"name":"gitlab-glfm-markdown","version":"0.0.19","platform":"ruby","checksum":"17a83a7ad1a63f2483a3c7fa75ecbc97467ec00123811793587995074f95811a"}, +{"name":"gitlab-glfm-markdown","version":"0.0.19","platform":"x86_64-darwin","checksum":"370a5706058219acaad5e856f4dafd3b6f76ac45222ed53d6edd0b284dc99dde"}, +{"name":"gitlab-glfm-markdown","version":"0.0.19","platform":"x86_64-linux","checksum":"d7d6e06e22669bd02c4fa5fbbca091e0f43a263bfd74fedb1fd974a5150d6fec"}, {"name":"gitlab-kas-grpc","version":"17.4.0.pre.rc1","platform":"ruby","checksum":"37679435a3e71b830b215741e78714984c3392fbc09d660b3102e4a5e6ab92ca"}, {"name":"gitlab-labkit","version":"0.36.1","platform":"ruby","checksum":"04fb6941b7e5fc1fdcee8f9971fa2086a4dc442e39e67a74b992403dd580c300"}, {"name":"gitlab-license","version":"2.5.0","platform":"ruby","checksum":"4c166c469c2ad17876ca43188a4ccebe3feb0726c4c1770047f8dcef96573f4d"}, diff --git a/Gemfile.lock b/Gemfile.lock index 6a2409d606a770e5e4ecf49d69bc48adf2abf2fe..b107134d32a44c5aa77663701246a33f28e2df69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -724,7 +724,7 @@ GEM mime-types net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.17) + gitlab-glfm-markdown (0.0.19) rb_sys (= 0.9.94) gitlab-kas-grpc (17.4.0.pre.rc1) grpc (~> 1.0) @@ -2060,7 +2060,7 @@ DEPENDENCIES gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 2.1.0) - gitlab-glfm-markdown (~> 0.0.17) + gitlab-glfm-markdown (~> 0.0.19) gitlab-housekeeper! gitlab-http! gitlab-kas-grpc (~> 17.4.0.pre.rc1) diff --git a/lib/banzai/filter/markdown_engines/glfm_markdown.rb b/lib/banzai/filter/markdown_engines/glfm_markdown.rb index f6d3ec583314d202d01fff1c4f260cf913d1a81d..faa5c7204be6e8d39541a2c61b42628dc235abd1 100644 --- a/lib/banzai/filter/markdown_engines/glfm_markdown.rb +++ b/lib/banzai/filter/markdown_engines/glfm_markdown.rb @@ -22,6 +22,7 @@ class GlfmMarkdown < Base multiline_block_quotes: true, relaxed_autolinks: true, sourcepos: true, + experimental_inline_sourcepos: true, smart: false, strikethrough: true, table: true, @@ -42,6 +43,7 @@ def render_options OPTIONS.merge( sourcepos: !sourcepos_disabled?, + experimental_inline_sourcepos: sourcepos_disabled? ? false : OPTIONS[:experimental_inline_sourcepos], header_ids: headers_disabled? ? nil : OPTIONS[:header_ids], autolink: !autolink_disabled?, relaxed_autolinks: !autolink_disabled?,