diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-03-26 22:56:37 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-03-26 22:56:37 +0300 |
| commit | 21ae60c6a841c3530571fecb330034912043d021 (patch) | |
| tree | 172a1a5f395883fd607ecda0b9866a40272cf9e6 /app/models/commit.rb | |
| parent | 3401227dd3a8b5adb1bf23d3b99d25d2ad1011b5 (diff) | |
| parent | 7c02d0cff3d79d9159b2966ce4807b71c4eff358 (diff) | |
| download | gitlab-ce-_mr-refector-review-target.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into _mr-refector-review-target_mr-refector-review-target
# Conflicts:
# app/assets/javascripts/notes.js
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index cceae5efb72..b64462fb768 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -175,7 +175,7 @@ class Commit if safe_message.blank? no_commit_message else - safe_message.split("\n", 2).first + safe_message.split(/[\r\n]/, 2).first end end |