diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:33:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:33:36 +0000 |
| commit | c9920c422d55680310cffcf34432d708de4bf207 (patch) | |
| tree | 1e37ea6e18772ea8de89f0b8ba8032c2873c76ab /CHANGELOG | |
| parent | f4cb6e438ab3cb03589c5ba36dc2b23c78b66c5a (diff) | |
| parent | c36adb98aa62a0f22f6ed290589cd2faf108abc4 (diff) | |
| download | gitlab-ce-c9920c422d55680310cffcf34432d708de4bf207.tar.gz | |
Merge branch 'fix-backslashes-inline-diff' into 'master'
Fix bug where backslashes in inline diffs could be dropped
This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:
```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```
The second backslash is dropped in the second `sub` statement:
With this fix, it looks like:
Closes #2253
See merge request !1143
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7c7f448b9be..9a6e25ae50a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) - Provide more feedback what went wrong if HipChat service failed test (Stan Hu) + - Fix bug where backslashes in inline diffs could be dropped (Stan Hu) - Disable turbolinks when linking to Bitbucket import status (Stan Hu) - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu) - Fix corrupted binary files when using API files endpoint (Stan Hu) |