diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
| commit | 9353c5c780c7af6d6ed3d6c501b155f82debc99c (patch) | |
| tree | 55d87571798f5ff10ee1431a296f1115251f67e9 /app/controllers/projects/issues_controller.rb | |
| parent | c287c01821c4db4830dbdd5263907f08c2ed4cc4 (diff) | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| download | gitlab-ce-pipelines_show_refactor.tar.gz | |
Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 73806454525..b14939c4216 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -60,20 +60,6 @@ class Projects::IssuesController < Projects::ApplicationController respond_with(@issue) end - def discussions - notes = @issue.notes - .inc_relations_for_view - .includes(:noteable) - .fresh - - notes = prepare_notes_for_rendering(notes) - notes = notes.reject { |n| n.cross_reference_not_visible_for?(current_user) } - - discussions = Discussion.build_collection(notes, @issue) - - render json: DiscussionSerializer.new(project: @project, noteable: @issue, current_user: current_user).represent(discussions) - end - def create create_params = issue_params.merge(spammable_params).merge( merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of], |