Merge branch 'kerrizor/remove-conditional-inline-assignment' into 'master'

Remove conditional assignment See merge request gitlab-org/gitlab!27960

Merge branch 'kerrizor/remove-conditional-inline-assignment' into 'master'
Remove conditional assignment See merge request gitlab-org/gitlab!27960
500c7604 · James Lopez · 84360544 · c7ae5917 · 500c7604
Commit 500c7604 authored Mar 26, 2020 by James Lopez
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/controllers/projects/merge_requests/diffs_controller.rb app/controllers/projects/merge_requests/diffs_controller.rb +2 -2

No files found.
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -92,8 +92,8 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
  # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/37735
  def find_merge_request_diff_compare
    @merge_request_diff =
-      if diff_id = params[:diff_id].presence
+      if params[:diff_id].present?
-        @merge_request.merge_request_diffs.viewable.find_by(id: diff_id)
+        @merge_request.merge_request_diffs.viewable.find_by(id: params[:diff_id])
      else
        @merge_request.merge_request_diff
      end