Merge branch 'zj-repository-size' into 'master'

Repository size is Gitaly only

Closes gitaly#393

See merge request gitlab-org/gitlab-ce!20089

1 files changed, 1 insertions, 15 deletions

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 2b599ee9f82..d79c4107200 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -403,13 +403,7 @@ module Gitlab
 
       # Return repo size in megabytes
       def size
-        size = gitaly_migrate(:repository_size) do |is_enabled|
-          if is_enabled
-            size_by_gitaly
-          else
-            size_by_shelling_out
-          end
-        end
+        size = gitaly_repository_client.repository_size
 
         (size.to_f / 1024).round(2)
       end
@@ -1822,14 +1816,6 @@ module Gitlab
         commit(sha)
       end
 
-      def size_by_shelling_out
-        popen(%w(du -sk), path).first.strip.to_i
-      end
-
-      def size_by_gitaly
-        gitaly_repository_client.repository_size
-      end
-
       # Returns true if the given ref name exists
       #
       # Ref names must start with `refs/`.