diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-30 12:58:20 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-30 12:58:20 +0100 |
| commit | 6412c4c54a7a824e108899a34b1ecec5cbdcec4b (patch) | |
| tree | afe9fa7485520c60d91315d8f73c6f1d64108c8c /app/models/commit.rb | |
| parent | ddb23d3b2ba7c646cff6a5d21957194fc3474418 (diff) | |
| parent | fa1eabe8e82f7635f2aa51733c727728577c7644 (diff) | |
| download | gitlab-ce-6412c4c54a7a824e108899a34b1ecec5cbdcec4b.tar.gz | |
Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-email
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 |