diff options
| author | James Lopez <james@jameslopez.es> | 2018-03-07 17:03:26 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-07 17:03:26 +0300 |
| commit | 92cf5d8ea5bb3c9f5a9d1f405d9811441aa4252a (patch) | |
| tree | 73487834db52f69dbbaeb5ba6df1caefa9445887 /app | |
| parent | 8d6f74ceefd682f756ee8f1300efae4d0f51c3c0 (diff) | |
Revert "Cleanup after adding MR diff's commit_count"
This reverts commit 0b7d108
Fixed confict in schema.rb
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 06aa67c600f..c1c27ccf3e5 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -197,6 +197,10 @@ class MergeRequestDiff < ActiveRecord::Base CompareService.new(project, head_commit_sha).execute(project, sha, straight: true) end + def commits_count + super || merge_request_diff_commits.size + end + private def create_merge_request_diff_files(diffs) |