diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
| commit | e07c27fee427195d8d89f6278d0fc12dfeec3588 (patch) | |
| tree | c4676e5e953aecef8bf2bb715619027cd556c9cc /app/services/notes | |
| parent | 029b7d2e9266246feff2f165a10b16be1d7fe88e (diff) | |
| parent | 415159c28da1aec00bb383d46aad67a9de75faae (diff) | |
| download | gitlab-ce-e07c27fee427195d8d89f6278d0fc12dfeec3588.tar.gz | |
Merge branch 'master' into 4273-slash-commands
# Conflicts:
# app/services/issues/create_service.rb
Diffstat (limited to 'app/services/notes')
| -rw-r--r-- | app/services/notes/post_process_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb index 534c48aefff..e4cd3fc7833 100644 --- a/app/services/notes/post_process_service.rb +++ b/app/services/notes/post_process_service.rb @@ -16,7 +16,7 @@ module Notes end def hook_data - Gitlab::NoteDataBuilder.build(@note, @note.author) + Gitlab::DataBuilder::Note.build(@note, @note.author) end def execute_note_hooks |