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 /lib/api/files.rb | |
| 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 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions