diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-13 18:10:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-13 18:10:01 +0000 |
| commit | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (patch) | |
| tree | 723ca67ce2b9c993960014eaeb04b5e5ff89e193 /spec/fixtures | |
| parent | b8f67b4ddf6b4a56fc25565d66230fc6e78ba72d (diff) | |
| parent | 545a85dc6487d80c3bc64df85f43765937ca3c86 (diff) | |
| download | gitlab-ce-9b0ef1559f78e58b398e428763ff97dfdc53e186.tar.gz | |
Merge branch 'better-parallel-diff' into 'master'
Actually render old and new sections of parallel diff next to each other
See merge request !5173
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/parallel_diff_result.yml | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/spec/fixtures/parallel_diff_result.yml b/spec/fixtures/parallel_diff_result.yml index 7d01183e3ef..333eda1191a 100644 --- a/spec/fixtures/parallel_diff_result.yml +++ b/spec/fixtures/parallel_diff_result.yml @@ -253,27 +253,6 @@ :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d :right: - :type: old - :number: - :text: '' - :line_code: - :position: -- :left: - :type: old - :number: 14 - :text: | - -<span id="LC14" class="line"> <span class="n">options</span> <span class="o">=</span> <span class="p">{</span> <span class="ss">chdir: </span><span class="n">path</span> <span class="p">}</span></span> - :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_13 - :position: !ruby/object:Gitlab::Diff::Position - attributes: - :old_path: files/ruby/popen.rb - :new_path: files/ruby/popen.rb - :old_line: 14 - :new_line: - :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 - :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 - :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d - :right: :type: new :number: 13 :text: | @@ -289,16 +268,17 @@ :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d - :left: - :type: - :number: - :text: '' - :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_14 + :type: old + :number: 14 + :text: | + -<span id="LC14" class="line"> <span class="n">options</span> <span class="o">=</span> <span class="p">{</span> <span class="ss">chdir: </span><span class="n">path</span> <span class="p">}</span></span> + :line_code: 2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_13 :position: !ruby/object:Gitlab::Diff::Position attributes: :old_path: files/ruby/popen.rb :new_path: files/ruby/popen.rb - :old_line: - :new_line: 14 + :old_line: 14 + :new_line: :base_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 :start_sha: 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 :head_sha: 570e7b2abdd848b95f2f578043fc23bd6f6fd24d |