diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-22 08:37:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-22 08:37:48 +0000 |
| commit | e03728013db9956c1749efa38f69d9a6f3f7ecf1 (patch) | |
| tree | a73a22eff70df383f67a5a2e548e1c9a96454bb5 /app/models/commit.rb | |
| parent | fd4e02920321a96c3de9bc0f7d2aca0ada77588f (diff) | |
| parent | 26cc7ee6afc12075a343d1ba30f2ad14d4173b7d (diff) | |
| download | gitlab-ce-e03728013db9956c1749efa38f69d9a6f3f7ecf1.tar.gz | |
Merge branch 'yisiliang/gitlab-ce-avoid-nil-safe_message' into 'master'
Avoid nil safe message
See merge request gitlab-org/gitlab-ce!21326
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 27fbdc3e386..594972ad344 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -193,6 +193,7 @@ class Commit # otherwise returns commit message without first line def description return safe_message if full_title.length >= 100 + return no_commit_message if safe_message.blank? safe_message.split("\n", 2)[1].try(:chomp) end |