From 09330dd17c73aefc1c9b8c7295a4b4a0c805a34b Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 5 Apr 2017 12:56:31 -0500 Subject: [PATCH] Remove unused code --- app/controllers/projects/notes_controller.rb | 3 +-- app/services/notes/build_service.rb | 4 ---- spec/controllers/projects/notes_controller_spec.rb | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 881e6d8d4b5..405ea3c0a4f 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -28,8 +28,7 @@ class Projects::NotesController < Projects::ApplicationController def create create_params = note_params.merge( merge_request_diff_head_sha: params[:merge_request_diff_head_sha], - in_reply_to_discussion_id: params[:in_reply_to_discussion_id], - new_discussion: params[:new_discussion], + in_reply_to_discussion_id: params[:in_reply_to_discussion_id] ) @note = Notes::CreateService.new(project, current_user, create_params).execute diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 7d5dca5282c..ea7cacc956c 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -2,7 +2,6 @@ module Notes class BuildService < ::BaseService def execute in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) - new_discussion = params.delete(:new_discussion) if project && in_reply_to_discussion_id.present? discussion = project.notes.find_discussion(in_reply_to_discussion_id) @@ -14,9 +13,6 @@ module Notes end params.merge!(discussion.reply_attributes) - elsif new_discussion - # TODO: Remove when we use a selectbox instead of a submit button - params[:type] = DiscussionNote.name end note = Note.new(params) diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 52a76776239..f140eaef5d5 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -153,8 +153,7 @@ describe Projects::NotesController do noteable_id: merge_request.id.to_s, noteable_type: 'MergeRequest', merge_request_diff_head_sha: 'sha', - in_reply_to_discussion_id: nil, - new_discussion: nil + in_reply_to_discussion_id: nil } expect(Notes::CreateService).to receive(:new).with(project, user, service_params).and_return(double(execute: true))