diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-05 08:25:27 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-03-05 15:37:01 +0100 |
| commit | 0b7d10851456018328da137beeca931767b4fd0a (patch) | |
| tree | 1a75a67228c2ed8ce703ca5705a536c2cfe39474 /app/models/merge_request_diff.rb | |
| parent | 8a0052c037f025b64159ca8cfe0d3451261c1edb (diff) | |
| download | gitlab-ce-0b7d10851456018328da137beeca931767b4fd0a.tar.gz | |
Cleanup after adding MR diff's commit_count
* processes any pending records which are not migrated yet
* bumps import_export version because of new commits_count attribute
* removes commits_count fallback method
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index c1c27ccf3e5..06aa67c600f 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -197,10 +197,6 @@ 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) |