Douwe Maan c9920c422d 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:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)

With this fix, it looks like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)

Closes #2253

See merge request !1143

2015-08-17 23:33:36 +00:00

..

backend

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

bitbucket_import

Fix Style/Blocks cop violations

2015-06-22 16:00:54 -04:00

diff

Fix bug where backslashes in inline diffs could be dropped

2015-08-11 18:39:27 -07:00

github_import

Fix Style/Blocks cop violations

2015-06-22 16:00:54 -04:00

gitlab_import

Fix Style/Blocks cop violations

2015-06-22 16:00:54 -04:00

gitorious_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

google_code_import

GoogleCode importer: Do not care about casing of image file extensions

2015-07-20 00:53:43 +02:00

ldap

Remove unnecessary whitespace between let and (

2015-06-22 14:39:07 +02:00

markdown

Merge branch 'rs-reference-data-attrs' into 'master'

2015-08-10 00:07:56 +00:00

o_auth

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

satellite

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

asciidoc_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

auth_spec.rb

Change to_not calls to not_to

2015-06-22 12:13:49 +02:00

closing_issue_extractor_spec.rb

Fix ClosingIssueExtractor specs

2015-05-26 15:55:26 -04:00

git_access_spec.rb

Fix GitAccess.

2015-05-13 09:46:22 +02:00

git_access_wiki_spec.rb

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

key_fingerprint_spec.rb

Refactor key fingerprint generation.

2015-04-14 12:00:43 +02:00

markup_helper_spec.rb

markup_helper: detect .mkd and .mkdn as markdown

2015-08-12 15:29:15 -04:00

note_data_builder_spec.rb

Revert "Update noteable after a new note is added"

2015-08-05 12:00:12 +03:00

popen_spec.rb

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

project_search_results_spec.rb

Add init test for ProjectSearchResults

2015-06-18 10:35:48 -07:00

push_data_builder_spec.rb

Extend project web hooks with more data

2015-02-20 10:27:37 -08:00

reference_extractor_spec.rb

Revert "Merge branch 'drop-satellites'"

2015-08-11 10:28:42 +02:00

regex_spec.rb

Fix (project_)name_regex to accept non-ASCII letters and dash

2015-04-27 16:38:47 +02:00

themes_spec.rb

Add Gitlab::Themes module; remove Gitlab::Theme

2015-06-13 17:58:16 -04:00

upgrader_spec.rb

Update mock and stub syntax for specs

2015-06-22 12:13:46 +02:00

url_builder_spec.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

version_info_spec.rb

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00