diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-06-15 12:28:30 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-06-15 14:47:05 +0200 |
| commit | 1924e5005d64bb333550b20ddb33b94e7e9d8f00 (patch) | |
| tree | fb65af45a691053152c2ca417170b3e7f4f958e4 | |
| parent | 11c957f5e5c2e35c11e81c6ab0c639eaa547b3e9 (diff) | |
| download | gitlab-ce-1924e5005d64bb333550b20ddb33b94e7e9d8f00.tar.gz | |
Don't translate `Commit#change_type_title` now
| -rw-r--r-- | app/models/commit.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 65d7ff02132..20206d57c4c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -1,4 +1,3 @@ -# coding: utf-8 class Commit extend ActiveModel::Naming @@ -139,7 +138,7 @@ class Commit safe_message.split("\n", 2)[1].try(:chomp) end - + def description? description.present? end @@ -292,7 +291,7 @@ class Commit end def change_type_title(user) - merged_merge_request?(user) ? s_('ChangeType|merge request') : s_('ChangeType|commit') + merged_merge_request?(user) ? 'merge request' : 'commit' end # Get the URI type of the given path |