diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-06-13 16:15:33 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-06-13 16:15:33 +0000 |
| commit | 1efd580cae90f210b3e88e4c4a51d20947b746b7 (patch) | |
| tree | e7c20b10269f3bdf3d4d1dce904712bbf9ef0d75 | |
| parent | 7291484d313f8f999e7f2c07978ca855fd04f1c1 (diff) | |
| parent | 7639b5801ce7fa6f91f8b309923594eeacc62490 (diff) | |
| download | gitlab-ce-1efd580cae90f210b3e88e4c4a51d20947b746b7.tar.gz | |
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
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 7481f1939ad..f07636e8f77 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -668,7 +668,7 @@ class MergeRequest < ApplicationRecord # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435 Gitlab::GitalyClient.allow_n_plus_1_calls do - merge_request_diffs.create + merge_request_diffs.create! reload_merge_request_diff end end |