summaryrefslogtreecommitdiff
path: root/app/controllers/notes_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/notes_controller.rb')
-rw-r--r--app/controllers/notes_controller.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index ca22af0de83..4f8b7bb9da3 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -12,11 +12,8 @@ class NotesController < ProjectResourceController
@notes = Notes::LoadContext.new(project, current_user, params).execute
if params[:target_type] == "merge_request"
- @has_diff = true
@mixed_targets = true
@discussions = discussions_from_notes
- elsif params[:target_type] == "commit"
- @has_diff = true
end
respond_with(@notes)