Merge branch 'ee-remaining-lib-differences' into 'master'

EE: resolve remaining CE to EE differences in lib/

See merge request gitlab-org/gitlab-ee!10430

ee/lib/tasks/cleanup.rake

+namespace :gitlab do
+  namespace :cleanup do
+    desc "GitLab | Cleanup | Delete moved repositories"
+    task moved: :gitlab_environment do
+      warn_user_is_not_gitlab
+      remove_flag = ENV['REMOVE']
+
+      Gitlab.config.repositories.storages.each do |name, repository_storage|
+        repo_root = repository_storage.legacy_disk_path.chomp('/')
+        # Look for global repos (legacy, depth 1) and normal repos (depth 2)
+        IO.popen(%W(find #{repo_root} -mindepth 1 -maxdepth 2 -name *+moved*.git)) do |find|
+          find.each_line do |path|
+            path.chomp!
+
+            if remove_flag
+              if FileUtils.rm_rf(path)
+                puts "Removed...#{path}".color(:green)
+              else
+                puts "Cannot remove #{path}".color(:red)
+              end
+            else
+              puts "Can be removed: #{path}".color(:green)
+            end
+          end
+        end
+      end
+
+      unless remove_flag
+        puts "To cleanup these repositories run this command with REMOVE=true".color(:yellow)
+      end
+    end
+  end
+end

lib/gitlab/view/presenter/delegated.rb

@@ -3,7 +3,6 @@
 module Gitlab
   module View
     module Presenter
-      # TODO: find a way to delegate calls to `class` methods to the subject's class; see gitlab-ce/#57299
       class Delegated < SimpleDelegator
         include Gitlab::View::Presenter::Base
 

lib/tasks/gitlab/cleanup.rake

@@ -36,36 +36,6 @@ namespace :gitlab do
       end
     end
 
-    desc "GitLab | Cleanup | Delete moved repositories"
-    task moved: :gitlab_environment do
-      warn_user_is_not_gitlab
-      remove_flag = ENV['REMOVE']
-
-      Gitlab.config.repositories.storages.each do |name, repository_storage|
-        repo_root = repository_storage.legacy_disk_path.chomp('/')
-        # Look for global repos (legacy, depth 1) and normal repos (depth 2)
-        IO.popen(%W(find #{repo_root} -mindepth 1 -maxdepth 2 -name *+moved*.git)) do |find|
-          find.each_line do |path|
-            path.chomp!
-
-            if remove_flag
-              if FileUtils.rm_rf(path)
-                puts "Removed...#{path}".color(:green)
-              else
-                puts "Cannot remove #{path}".color(:red)
-              end
-            else
-              puts "Can be removed: #{path}".color(:green)
-            end
-          end
-        end
-      end
-
-      unless remove_flag
-        puts "To cleanup these repositories run this command with REMOVE=true".color(:yellow)
-      end
-    end
-
     desc "GitLab | Cleanup | Clean repositories"
     task repos: :gitlab_environment do
       move_suffix = "+orphaned+#{Time.now.to_i}"

lib/tasks/gitlab/info.rake

@@ -14,8 +14,12 @@ namespace :gitlab do
       rake_version = run_and_match(%w(rake --version), /[\d\.]+/).try(:to_s)
       # check redis version
       redis_version = run_and_match(%w(redis-cli --version), /redis-cli (\d+\.\d+\.\d+)/).to_a
+
       # check for system defined proxies
-      proxies = Gitlab::Proxy.detect_proxy.map {|k, v| "#{k}: #{v}"}.join("\n\t\t")
+      if Gitlab.ee?
+        proxies = Gitlab::Proxy.detect_proxy.map {|k, v| "#{k}: #{v}"}.join("\n\t\t")
+      end
+
       # check Git version
       git_version = run_and_match([Gitlab.config.git.bin_path, '--version'], /git version ([\d\.]+)/).to_a
       # check Go version
@@ -24,7 +28,11 @@ namespace :gitlab do
       puts ""
       puts "System information".color(:yellow)
       puts "System:\t\t#{os_name || "unknown".color(:red)}"
-      puts "Proxy:\t\t#{proxies.present? ? proxies.color(:green) : "no"}"
+
+      if Gitlab.ee?
+        puts "Proxy:\t\t#{proxies.present? ? proxies.color(:green) : "no"}"
+      end
+
       puts "Current User:\t#{run_command(%w(whoami))}"
       puts "Using RVM:\t#{rvm_version.present? ? "yes".color(:green) : "no"}"
       puts "RVM Version:\t#{rvm_version}" if rvm_version.present?
@@ -42,12 +50,14 @@ namespace :gitlab do
       http_clone_url = project.http_url_to_repo
       ssh_clone_url  = project.ssh_url_to_repo
 
-      geo_node_type =
-        if Gitlab::Geo.current_node
-          Gitlab::Geo.current_node.primary ? 'Primary' : 'Secondary'
-        else
-          'Undefined'.color(:red)
-        end
+      if Gitlab.ee?
+        geo_node_type =
+          if Gitlab::Geo.current_node
+            Gitlab::Geo.current_node.primary ? 'Primary' : 'Secondary'
+          else
+            'Undefined'.color(:red)
+          end
+      end
 
       omniauth_providers = Gitlab.config.omniauth.providers.map { |provider| provider['name'] }
 
@@ -61,9 +71,13 @@ namespace :gitlab do
       puts "URL:\t\t#{Gitlab.config.gitlab.url}"
       puts "HTTP Clone URL:\t#{http_clone_url}"
       puts "SSH Clone URL:\t#{ssh_clone_url}"
-      puts "Elasticsearch:\t#{Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing? ? "yes".color(:green) : "no"}"
-      puts "Geo:\t\t#{Gitlab::Geo.enabled? ? "yes".color(:green) : "no"}"
-      puts "Geo node:\t#{geo_node_type}" if Gitlab::Geo.enabled?
+
+      if Gitlab.ee?
+        puts "Elasticsearch:\t#{Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing? ? "yes".color(:green) : "no"}"
+        puts "Geo:\t\t#{Gitlab::Geo.enabled? ? "yes".color(:green) : "no"}"
+        puts "Geo node:\t#{geo_node_type}" if Gitlab::Geo.enabled?
+      end
+
       puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}"
       puts "Using Omniauth:\t#{Gitlab::Auth.omniauth_enabled? ? "yes".color(:green) : "no"}"
       puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab::Auth.omniauth_enabled?