Merge branch '2055-lfs-objects-being-counted-twice' into 'master'

removes the duplicate sum of lfs objects

Closes #2055

See merge request !1599

app/models/project.rb

@@ -1497,7 +1497,7 @@ class Project < ActiveRecord::Base
   end
 
   def repository_and_lfs_size
-    statistics.storage_size + statistics.lfs_objects_size
+    statistics.total_repository_size
   end
 
   def above_size_limit?

changelogs/unreleased-ee/2055-lfs-objects-being-counted-twice.yml

+---
+title: Removes duplicate count of LFS objects from repository_and_lfs_size method
+merge_request: 1599
+author:

spec/models/project_spec.rb

@@ -2019,6 +2019,19 @@ describe Project, models: true do
     end
   end
 
+  describe '#repository_and_lfs_size' do
+    let(:project) { create(:project) }
+    let(:size) { 50 }
+
+    before do
+      allow(project.statistics).to receive(:total_repository_size).and_return(size)
+    end
+
+    it 'returns the total repository and lfs size' do
+      expect(project.repository_and_lfs_size).to eq(size)
+    end
+  end
+
   describe '#approver_group_ids=' do
     let(:project) { create(:empty_project) }