diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
| commit | 870d71b78be74b7fab4892a79a87aff39b1e2726 (patch) | |
| tree | 0628116973b67c573509f8affe50cc3d6c9a6f4f /app/models/custom_emoji.rb | |
| parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
| parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) | |
Merge branch 'master' into gs-master
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 65d9840d5..28b6a2b0b 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -15,6 +15,7 @@ # disabled :boolean default(FALSE), not null # uri :string # image_remote_url :string +# visible_in_picker :boolean default(TRUE), not null # class CustomEmoji < ApplicationRecord |