diff options
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 20206d57c4c..65d7ff02132 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -1,3 +1,4 @@ +# coding: utf-8 class Commit extend ActiveModel::Naming @@ -138,7 +139,7 @@ class Commit safe_message.split("\n", 2)[1].try(:chomp) end - + def description? description.present? end @@ -291,7 +292,7 @@ class Commit end def change_type_title(user) - merged_merge_request?(user) ? 'merge request' : 'commit' + merged_merge_request?(user) ? s_('ChangeType|merge request') : s_('ChangeType|commit') end # Get the URI type of the given path |