Commit 1efd580c authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '62690-raise-error-when-creating-mr-diff-fails' into 'master'

Raise an error if creating the MergeRequestDiff fails

See merge request gitlab-org/gitlab-ce!29434
parents 7291484d 7639b580
...@@ -668,7 +668,7 @@ class MergeRequest < ApplicationRecord ...@@ -668,7 +668,7 @@ class MergeRequest < ApplicationRecord
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435 # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435
Gitlab::GitalyClient.allow_n_plus_1_calls do Gitlab::GitalyClient.allow_n_plus_1_calls do
merge_request_diffs.create merge_request_diffs.create!
reload_merge_request_diff reload_merge_request_diff
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment