diff options
| -rw-r--r-- | app/models/diff_discussion.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 758a26d3c70..d67b16584a4 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -23,9 +23,8 @@ class DiffDiscussion < Discussion def merge_request_version_params return unless for_merge_request? - version_params do |params| + version_params.tap do |params| params[:commit_id] = commit_id if on_merge_request_commit? - params end end @@ -39,11 +38,8 @@ class DiffDiscussion < Discussion private def version_params - params = if active? - {} - else - noteable.version_params_for(position.diff_refs) - end - yield params + return {} if active? + + noteable.version_params_for(position.diff_refs) end end |