diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
commit | a18a58625751611dba4400c574fabfd4a4507a56 (patch) | |
tree | 663342f70b17e674aee3add0d4b57028d03e8b1a /config/initializers/inflections.rb | |
parent | 0dba294f99e5ec672b4a8a97b5d51ac79a3efc8b (diff) | |
parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
download | gitlab-ce-a18a58625751611dba4400c574fabfd4a4507a56.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip
Diffstat (limited to 'config/initializers/inflections.rb')
-rw-r--r-- | config/initializers/inflections.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9e8b0131f8f..3d1a41a4652 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -8,3 +8,7 @@ # inflect.irregular 'person', 'people' # inflect.uncountable %w( fish sheep ) # end +# +ActiveSupport::Inflector.inflections do |inflect| + inflect.uncountable %w(award_emoji) +end |