diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-05 17:19:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-05 17:19:31 +0000 |
| commit | 49f72d06654bd7bdea259154e1092a53aab57acc (patch) | |
| tree | 96af0835f605721b0393044c887f1ae6e79d3a3a /app/models | |
| parent | 2acb2fb3481d59e20ff4eae438b021bdb5837b4b (diff) | |
| parent | 0b7d10851456018328da137beeca931767b4fd0a (diff) | |
| download | gitlab-ce-49f72d06654bd7bdea259154e1092a53aab57acc.tar.gz | |
Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-ui
Cleanup after adding MR diff's commit_count
Closes #41698
See merge request gitlab-org/gitlab-ce!17513
Diffstat (limited to 'app/models')
| -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) |