diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 15:30:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 15:30:14 +0200 |
| commit | 39a86963e93b4a24296ffe96e63c5a189f8d1d07 (patch) | |
| tree | c04e8fd59cfbf53420d2f63d3d80ec67a2c8537a /app | |
| parent | 193a5ed3c3c352f043752c8ed3b0f3d1cb8c0ddc (diff) | |
| download | gitlab-ce-39a86963e93b4a24296ffe96e63c5a189f8d1d07.tar.gz | |
Set mr_diff state to collected if diff is ok
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index d06b95daa6a..3ea610197e6 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -130,7 +130,10 @@ class MergeRequestDiff < ActiveRecord::Base end end - new_diffs = dump_commits(new_diffs) if new_diffs.present? + if new_diffs.present? + new_diffs = dump_commits(new_diffs) + self.state = :collected + end self.st_diffs = new_diffs self.save |