IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Emoji sets shouldn't be root level keys

Browse Source
This commit is contained in:
Robin Ward
2016-07-22 15:27:51 -04:00
parent da27237240
commit 944b2aabfe
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/emoji_set_site_setting.rb
View File

@@ -29,11 +29,11 @@ class EmojiSetSiteSetting < EnumSiteSetting
def self.values
@values ||= [
{ name: 'apple_international', value: 'apple' },
{ name: 'google', value: 'google' },
{ name: 'twitter', value: 'twitter' },
{ name: 'emoji_one', value: 'emoji_one' },
{ name: 'win10_emoji', value: 'win10' }
{ name: 'emoji_set.apple_international', value: 'apple' },
{ name: 'emoji_set.google', value: 'google' },
{ name: 'emoji_set.twitter', value: 'twitter' },
{ name: 'emoji_set.emoji_one', value: 'emoji_one' },
{ name: 'emoji_set.win10', value: 'win10' }
]
end