diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-03 23:54:04 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-03 23:54:04 +0300 |
| commit | dfb9ac3a5f97a4c556bacea78174836fe7d39145 (patch) | |
| tree | 4ca307bce38dae6d4f37c6db232e7a5bd3e1b8cd /spec/javascripts | |
| parent | 5ed4716a14b9a3abd184c8503e6a1e492806d8de (diff) | |
| parent | 8aedb71c4900021ca74e188873278ac40356f40e (diff) | |
Merge branch '_acet-fix-diff-file-header' into 'master'
Fix showing diff file header for renamed files
Closes #48887
See merge request gitlab-org/gitlab-ce!22089
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/diffs/mock_data/diff_file.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/diffs/mock_data/diff_file.js b/spec/javascripts/diffs/mock_data/diff_file.js index 372b8f066cf..2aa2f8f3528 100644 --- a/spec/javascripts/diffs/mock_data/diff_file.js +++ b/spec/javascripts/diffs/mock_data/diff_file.js @@ -33,7 +33,7 @@ export default { contentSha: 'c48ee0d1bf3b30453f5b32250ce03134beaa6d13', storedExternally: null, externalStorage: null, - oldPathHtml: ['CHANGELOG', 'CHANGELOG'], + oldPathHtml: 'CHANGELOG', newPathHtml: 'CHANGELOG', editPath: '/gitlab-org/gitlab-test/edit/spooky-stuff/CHANGELOG', viewPath: '/gitlab-org/gitlab-test/blob/spooky-stuff/CHANGELOG', |