diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:31:50 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:32:38 -0300 |
| commit | d2971315abd0e6e94860505e50ec71082c3679da (patch) | |
| tree | 0f3dcf23406ec9fb3d6362b7f746e978ace692b3 /app/controllers/projects/notes_controller.rb | |
| parent | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (diff) | |
| parent | bef4294c58e0bbadc01f633fc8bea514801de7ae (diff) | |
| download | gitlab-ce-issue_3359_3.tar.gz | |
Merge branch 'master' into issue_3359_3issue_3359_3
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 836f79ff080..e14fe26dde7 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -24,6 +24,10 @@ class Projects::NotesController < Projects::ApplicationController def create @note = Notes::CreateService.new(project, current_user, note_params).execute + if @note.is_a?(Note) + Banzai::NoteRenderer.render([@note], @project, current_user) + end + respond_to do |format| format.json { render json: note_json(@note) } format.html { redirect_back_or_default } @@ -33,6 +37,10 @@ class Projects::NotesController < Projects::ApplicationController def update @note = Notes::UpdateService.new(project, current_user, note_params).execute(note) + if @note.is_a?(Note) + Banzai::NoteRenderer.render([@note], @project, current_user) + end + respond_to do |format| format.json { render json: note_json(@note) } format.html { redirect_back_or_default } @@ -118,6 +126,8 @@ class Projects::NotesController < Projects::ApplicationController name: note.name } elsif note.valid? + Banzai::NoteRenderer.render([note], @project, current_user) + { valid: true, id: note.id, |
