diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 18:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-08 18:08:30 +0300 |
| commit | ec9dd96cd876d8778bb757a1e1e0252a58fdcbbb (patch) | |
| tree | 434606041cb42bcc922a02efe52a156b792e123b /vendor | |
| parent | 473b876fe3d7e0b36eb6268cc44a4fe0d94f4422 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
9 files changed, 6 insertions, 8 deletions
diff --git a/vendor/gems/ipynbdiff/lib/symbolized_markdown_helper.rb b/vendor/gems/ipynbdiff/lib/symbolized_markdown_helper.rb index 918666ed899..c075aa0d878 100644 --- a/vendor/gems/ipynbdiff/lib/symbolized_markdown_helper.rb +++ b/vendor/gems/ipynbdiff/lib/symbolized_markdown_helper.rb @@ -12,7 +12,7 @@ module IpynbDiff if content.is_a?(Array) content.map.with_index { |l, idx| _(symbol / idx, block.call(l)) } else - _(symbol, content) + content.split("\n").map { |c| _(symbol, c) } end end end diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected.md b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected.md index 9100045e0f5..c6d8e13fc3a 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected.md +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected.md @@ -1,5 +1,4 @@ %% Cell type:code id:3 tags: ``` - ``` diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected_symbols.txt b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected_symbols.txt index 5f9ad320b8c..2e902582e14 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected_symbols.txt +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_kernelspec/expected_symbols.txt @@ -1,5 +1,4 @@ .cells.0 .cells.0.source -.cells.0.source diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected.md b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected.md index 9100045e0f5..c6d8e13fc3a 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected.md +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected.md @@ -1,5 +1,4 @@ %% Cell type:code id:3 tags: ``` - ``` diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected_symbols.txt b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected_symbols.txt index 5f9ad320b8c..2e902582e14 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected_symbols.txt +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_language/expected_symbols.txt @@ -1,5 +1,4 @@ .cells.0 .cells.0.source -.cells.0.source diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected.md b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected.md index 9100045e0f5..c6d8e13fc3a 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected.md +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected.md @@ -1,5 +1,4 @@ %% Cell type:code id:3 tags: ``` - ``` diff --git a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected_symbols.txt b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected_symbols.txt index 5f9ad320b8c..2e902582e14 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected_symbols.txt +++ b/vendor/gems/ipynbdiff/spec/testdata/only_code_no_metadata/expected_symbols.txt @@ -1,5 +1,4 @@ .cells.0 .cells.0.source -.cells.0.source diff --git a/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected.md b/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected.md index c62e8fd6b9a..180fffe24ce 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected.md +++ b/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected.md @@ -1,3 +1,5 @@ %% Cell type:markdown id: tags: -> This is a test\n>\n> To see if I can duplicate my bug +> This is a test +> +> To see if I can duplicate my bug diff --git a/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected_symbols.txt b/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected_symbols.txt index 86a7f6b3960..1e8bdda4b9a 100644 --- a/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected_symbols.txt +++ b/vendor/gems/ipynbdiff/spec/testdata/source_with_linebreak/expected_symbols.txt @@ -1,3 +1,5 @@ .cells.0 .cells.0.source +.cells.0.source +.cells.0.source |