diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
| commit | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (patch) | |
| tree | b39508df518df88682703b4525f6895113ec4a8a /app/services/notes | |
| parent | 2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 (diff) | |
| download | gitlab-ce-7a4e7ad04e1fc96953d9159e8e1a2208990d34f7.tar.gz | |
Fix tests and wrong choices during merge
Diffstat (limited to 'app/services/notes')
| -rw-r--r-- | app/services/notes/create_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index bbf7889166d..509deb898b1 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -7,7 +7,7 @@ module Notes if note.award_emoji? return ToggleAwardEmojiService.new(project, current_user, params). - execute(note.award_emoji_name, note.note) + execute(note.noteable, note.award_emoji_name) end return unless valid_project?(note) |