diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
| commit | 635ebac606d77eae03ce2e2a8f0a814ad4c79177 (patch) | |
| tree | 8f3047074880166e53edb987df8ba4295d374c3d /app/models/commit.rb | |
| parent | ac7af45d8987422c2a529d3d87eae6d9bd608e12 (diff) | |
| parent | 704922c855a9741b5495db56ac266788a9c25c33 (diff) | |
| download | gitlab-ce-635ebac606d77eae03ce2e2a8f0a814ad4c79177.tar.gz | |
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index baccf286740..e0461809e10 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -88,11 +88,12 @@ class Commit # cut off, ellipses (`&hellp;`) are prepended to the commit message. def description title_end = safe_message.index("\n") - @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100) - "…".html_safe << safe_message[80..-1] - else - safe_message.split("\n", 2)[1].try(:chomp) - end + @description ||= + if (!title_end && safe_message.length > 100) || (title_end && title_end > 100) + "…".html_safe << safe_message[80..-1] + else + safe_message.split("\n", 2)[1].try(:chomp) + end end def description? |