diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-08 12:43:14 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-08 12:43:14 +0100 |
| commit | 7db225e480e78948a1fc70517b4c8ab6ac1aeaf5 (patch) | |
| tree | a14fc88751d29173c86297ddb06089aa32c8e215 /app/models/merge_request_diff.rb | |
| parent | 0f26f9681faf2d49949f52227d6f4bd90c1b6e93 (diff) | |
| download | gitlab-ce-7db225e480e78948a1fc70517b4c8ab6ac1aeaf5.tar.gz | |
Revert "Cleanup after adding MR diff's commit_count"
This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -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) |