diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-07 12:26:56 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-07 12:26:56 +0000 |
| commit | 359d94607c2df324bc5cd9591bded05dbe9ca157 (patch) | |
| tree | 1ab19b405514e2e980bb241dd379bb1a981b8932 /spec/models/commit_spec.rb | |
| parent | 104df74f512dd7174a49504dda0b0910ee43b787 (diff) | |
| parent | 893d08c0dc6a1eba14db7694636707f30b28a7f4 (diff) | |
| download | gitlab-ce-359d94607c2df324bc5cd9591bded05dbe9ca157.tar.gz | |
Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment
This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.
Closes #3734
cc @vsizov
See merge request !1936
Diffstat (limited to 'spec/models/commit_spec.rb')
0 files changed, 0 insertions, 0 deletions