diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-23 17:30:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-23 17:30:19 +0100 |
| commit | 70fa9d5629f6a368da5d649450e3e575ca1c252a (patch) | |
| tree | 715c2ce7fe41c8b49b01f3e9400e2bee03a84a2d /app/models/merge_request.rb | |
| parent | bc4e25189805879490555ef2782193470f4fe295 (diff) | |
| download | gitlab-ce-merge-status-without-timestamps.tar.gz | |
Don't mark merge request as updated when merge status relative to target branch changes.merge-status-without-timestamps
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 798306f6dcc..5634f9a686e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -105,6 +105,15 @@ class MergeRequest < ActiveRecord::Base state :unchecked state :can_be_merged state :cannot_be_merged + + around_transition do |merge_request, transition, block| + merge_request.record_timestamps = false + begin + block.call + ensure + merge_request.record_timestamps = true + end + end end validates :source_project, presence: true, unless: :allow_broken |