diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-01-25 11:23:25 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-01-25 11:23:25 -0600 |
| commit | 21755ac9e9e349c4291e6f64109abe0b4588436d (patch) | |
| tree | e8123e81ef63ebd7d9936042d6bd3a66e6a8760d /app/models/merge_request.rb | |
| parent | 43dc6263526dbbb7dab44d91406c36b07ce2829b (diff) | |
| parent | b55c1bc4b5fb8d259ba9f264eff607f81012fa39 (diff) | |
| download | gitlab-ce-21755ac9e9e349c4291e6f64109abe0b4588436d.tar.gz | |
Merge branch 'master' into copy-as-md
# Conflicts:
# app/assets/javascripts/lib/utils/common_utils.js.es6
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index cd5b345bae5..6753504acff 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -865,9 +865,11 @@ class MergeRequest < ActiveRecord::Base paths: paths ) - active_diff_notes.each do |note| - service.execute(note) - Gitlab::Timeless.timeless(note, &:save) + transaction do + active_diff_notes.each do |note| + service.execute(note) + Gitlab::Timeless.timeless(note, &:save) + end end end |