Enable Rails/Delegate

25 files changed, 39 insertions, 110 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 21d692c2859..e07282dd894 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -763,7 +763,7 @@ Rails/Date:
 
 # Prefer delegate method for delegations.
 Rails/Delegate:
-  Enabled: false
+  Enabled: true
 
 # Prefer `find_by` over `where.first`.
 Rails/FindBy:
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 60485160495..4b025669f69 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -1,28 +1,15 @@
 module ApplicationSettingsHelper
-  def gravatar_enabled?
-    current_application_settings.gravatar_enabled?
-  end
-
-  def signup_enabled?
-    current_application_settings.signup_enabled?
-  end
-
-  def signin_enabled?
-    current_application_settings.signin_enabled?
-  end
+  delegate  :gravatar_enabled?,
+            :signup_enabled?,
+            :signin_enabled?,
+            :akismet_enabled?,
+            :koding_enabled?,
+            to: :current_application_settings
 
   def user_oauth_applications?
     current_application_settings.user_oauth_applications
   end
 
-  def askimet_enabled?
-    current_application_settings.akismet_enabled?
-  end
-
-  def koding_enabled?
-    current_application_settings.koding_enabled?
-  end
-
   def allowed_protocols_present?
     current_application_settings.enabled_git_access_protocol.present?
   end
diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb
index fc93acfe63e..169cedeb796 100644
--- a/app/helpers/visibility_level_helper.rb
+++ b/app/helpers/visibility_level_helper.rb
@@ -89,13 +89,9 @@ module VisibilityLevelHelper
     current_application_settings.restricted_visibility_levels || []
   end
 
-  def default_project_visibility
-    current_application_settings.default_project_visibility
-  end
-
-  def default_group_visibility
-    current_application_settings.default_group_visibility
-  end
+  delegate  :default_project_visibility,
+            :default_group_visibility,
+            to: :current_application_settings
 
   def skip_level?(form_model, level)
     form_model.is_a?(Project) && !form_model.visibility_level_allowed?(level)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7e21eb22e27..d2a53315f1d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -233,9 +233,7 @@ module Ci
       gl_project_id
     end
 
-    def project_name
-      project.name
-    end
+    delegate :name, to: :project, prefix: true
 
     def repo_url
       auth = "gitlab-ci-token:#{ensure_token!}@"
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 999720d2ea3..d2312215f85 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -153,9 +153,7 @@ module Ci
       builds.latest.with_artifacts_not_expired.includes(project: [:namespace])
     end
 
-    def project_id
-      project.id
-    end
+    delegate :id, to: :project, prefix: true
 
     # For now the only user who participates is the user who triggered
     def participants(_current_user = nil)
diff --git a/app/models/project.rb b/app/models/project.rb
index f2be9e6a80c..a1b29d335b3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -838,9 +838,7 @@ class Project < ActiveRecord::Base
     false
   end
 
-  def empty_repo?
-    repository.empty_repo?
-  end
+  delegate :empty_repo?, to: :repository
 
   def repo
     repository.raw
@@ -1029,9 +1027,7 @@ class Project < ActiveRecord::Base
     forked? && project == forked_from_project
   end
 
-  def forks_count
-    forks.count
-  end
+  delegate :count, to: :forks, prefix: true
 
   def origin_merge_requests
     merge_requests.where(source_project_id: self.id)
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index de36fd3b252..2f55b853232 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -60,9 +60,7 @@ class ProjectWiki
     !!repository.exists?
   end
 
-  def empty?
-    pages.empty?
-  end
+  delegate :empty?, to: :pages
 
   # Returns an Array of Gitlab WikiPage instances or an
   # empty Array if this Wiki has no pages.
@@ -160,9 +158,7 @@ class ProjectWiki
     }
   end
 
-  def repository_storage_path
-    project.repository_storage_path
-  end
+  delegate :repository_storage_path, to: :project
 
   private
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7113879417e..d1dd900d597 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -487,9 +487,7 @@ class Repository
   end
   cache_method :exists?
 
-  def empty?
-    raw_repository.empty?
-  end
+  delegate :empty?, to: :raw_repository
   cache_method :empty?
 
   # The size of this repository in megabytes.
@@ -508,9 +506,7 @@ class Repository
   end
   cache_method :branch_names, fallback: []
 
-  def tag_names
-    raw_repository.tag_names
-  end
+  delegate :tag_names, to: :raw_repository
   cache_method :tag_names, fallback: []
 
   def branch_count
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb
index b9f1c29c32e..e07b144355a 100644
--- a/app/policies/base_policy.rb
+++ b/app/policies/base_policy.rb
@@ -6,9 +6,7 @@ class BasePolicy
       @cannot_set = cannot_set
     end
 
-    def size
-      to_set.size
-    end
+    delegate :size, to: :to_set
 
     def self.empty
       new(Set.new, Set.new)
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index fa45506317e..745c2c4b681 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -28,9 +28,7 @@ class BaseService
     SystemHooksService.new
   end
 
-  def repository
-    project.repository
-  end
+  delegate :repository, to: :project
 
   # Add an error to the specified model for restricted visibility levels
   def deny_visibility_level(model, denied_visibility_level = nil)
diff --git a/app/services/ci/create_pipeline_builds_service.rb b/app/services/ci/create_pipeline_builds_service.rb
index c5da757c840..4cbbd366cc4 100644
--- a/app/services/ci/create_pipeline_builds_service.rb
+++ b/app/services/ci/create_pipeline_builds_service.rb
@@ -10,9 +10,7 @@ module Ci
       end
     end
 
-    def project
-      pipeline.project
-    end
+    delegate :project, to: :pipeline
 
     private
 
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 19a947af4ca..d068c895fa3 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -33,7 +33,7 @@
           Abuse Reports
           %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
 
-    - if askimet_enabled?
+    - if akismet_enabled?
       = nav_link(controller: :spam_logs) do
         = link_to admin_spam_logs_path, title: "Spam Logs" do
           %span
diff --git a/lib/bitbucket/connection.rb b/lib/bitbucket/connection.rb
index 287410bf46f..b9279c33f5b 100644
--- a/lib/bitbucket/connection.rb
+++ b/lib/bitbucket/connection.rb
@@ -24,9 +24,7 @@ module Bitbucket
       response.parsed
     end
 
-    def expired?
-      connection.expired?
-    end
+    delegate :expired?, to: :connection
 
     def refresh!
       response = connection.refresh!
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb
index 9b484a2ecfd..3b210eeda9d 100644
--- a/lib/gitlab/access.rb
+++ b/lib/gitlab/access.rb
@@ -21,9 +21,7 @@ module Gitlab
     PROTECTION_DEV_CAN_MERGE = 3
 
     class << self
-      def values
-        options.values
-      end
+      delegate :values, to: :options
 
       def all_values
         options_with_owner.values
diff --git a/lib/gitlab/ci/build/artifacts/metadata/entry.rb b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
index 7f4c750b6fd..c1d4d541efb 100644
--- a/lib/gitlab/ci/build/artifacts/metadata/entry.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
@@ -91,9 +91,7 @@ module Gitlab
           blank_node? || @entries.include?(@path)
         end
 
-        def empty?
-          children.empty?
-        end
+        delegate :empty?, to: :children
 
         def total_size
           descendant_pattern = %r{^#{Regexp.escape(@path)}}
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index e20f5f6f514..82576d197fe 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -25,9 +25,7 @@ module Gitlab
       settings || in_memory_application_settings
     end
 
-    def sidekiq_throttling_enabled?
-      current_application_settings.sidekiq_throttling_enabled?
-    end
+    delegate :sidekiq_throttling_enabled?, to: :current_application_settings
 
     def in_memory_application_settings
       @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults)
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index d785516ebdd..fd2b26c4a63 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -218,9 +218,7 @@ module Gitlab
         raw_commit.parents.map { |c| Gitlab::Git::Commit.new(c) }
       end
 
-      def tree
-        raw_commit.tree
-      end
+      delegate :tree, to: :raw_commit
 
       def stats
         Gitlab::Git::CommitStats.new(self)
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 7068e68a855..e1fabff4e29 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -162,13 +162,9 @@ module Gitlab
         !empty?
       end
 
-      def empty?
-        rugged.empty?
-      end
-
-      def bare?
-        rugged.bare?
-      end
+      delegate  :empty?,
+                :bare?,
+                to: :rugged
 
       def repo_exists?
         !!rugged
@@ -565,9 +561,7 @@ module Gitlab
       #    will trigger a +:mixed+ reset and the working directory will be
       #    replaced with the content of the index. (Untracked and ignored files
       #    will be left alone)
-      def reset(ref, reset_type)
-        rugged.reset(ref, reset_type)
-      end
+      delegate :reset, to: :rugged
 
       # Mimic the `git clean` command and recursively delete untracked files.
       # Valid keys that can be passed in the +options+ hash are:
diff --git a/lib/gitlab/github_import/issuable_formatter.rb b/lib/gitlab/github_import/issuable_formatter.rb
index 29fb0f9d333..27b171d6ddb 100644
--- a/lib/gitlab/github_import/issuable_formatter.rb
+++ b/lib/gitlab/github_import/issuable_formatter.rb
@@ -7,9 +7,7 @@ module Gitlab
         raise NotImplementedError
       end
 
-      def number
-        raw_data.number
-      end
+      delegate :number, to: :raw_data
 
       def find_condition
         { iid: number }
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb
index 7084fd1767d..43eb73250b7 100644
--- a/lib/gitlab/ldap/person.rb
+++ b/lib/gitlab/ldap/person.rb
@@ -43,9 +43,7 @@ module Gitlab
         attribute_value(:email)
       end
 
-      def dn
-        entry.dn
-      end
+      delegate :dn, to: :entry
 
       private
 
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index 53665c8375e..e9c07095042 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -13,15 +13,11 @@ module Gitlab
 
     class << self
       # Do NOT cache in an instance variable. Result may be mutated by caller.
-      def params
-        new.params
-      end
+      delegate :params, to: :new
 
       # Do NOT cache in an instance variable. Result may be mutated by caller.
       # @deprecated Use .params instead to get sentinel support
-      def url
-        new.url
-      end
+      delegate :url, to: :new
 
       def with
         @pool ||= ConnectionPool.new(size: pool_size) { ::Redis.new(params) }
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index a4e966e4016..b28708c34e1 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -33,9 +33,7 @@ module Gitlab
     PUBLIC   = 20 unless const_defined?(:PUBLIC)
 
     class << self
-      def values
-        options.values
-      end
+      delegate :values, to: :options
 
       def options
         {
diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index d5d87310874..56772409989 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -1,7 +1,5 @@
 describe Gitlab::Utils, lib: true do
-  def to_boolean(value)
-    described_class.to_boolean(value)
-  end
+  delegate :to_boolean, to: :described_class
 
   describe '.to_boolean' do
     it 'accepts booleans' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index be9847f37b3..2c03a485823 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -693,9 +693,7 @@ describe User, models: true do
   end
 
   describe '.search_with_secondary_emails' do
-    def search_with_secondary_emails(query)
-      described_class.search_with_secondary_emails(query)
-    end
+    delegate :search_with_secondary_emails, to: :described_class
 
     let!(:user) { create(:user) }
     let!(:email) { create(:email) }
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index ef2ddc4b1d7..b818dfdd50c 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -377,9 +377,7 @@ describe Ci::ProcessPipelineService, :services do
     builds.pending.update_all(status: 'success')
   end
 
-  def manual_actions
-    pipeline.manual_actions
-  end
+  delegate :manual_actions, to: :pipeline
 
   def create_build(name, stage_idx, when_value = nil)
     create(:ci_build,