From 3288e1a874ec0184f9f27f932748e51c57babf17 Mon Sep 17 00:00:00 2001
From: Andrew Newdigate <andrew@gitlab.com>
Date: Fri, 8 Feb 2019 14:19:53 +0200
Subject: Adds the Rubocop ReturnNil cop

This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
---
 lib/api/helpers/pagination.rb                                       | 2 +-
 lib/bitbucket_server/collection.rb                                  | 4 ++--
 lib/declarative_policy/rule.rb                                      | 6 +++---
 lib/gitlab/auth/ldap/config.rb                                      | 4 ++--
 lib/gitlab/auth/ldap/person.rb                                      | 2 +-
 lib/gitlab/auth/saml/auth_hash.rb                                   | 4 ++--
 .../background_migration/migrate_events_to_push_event_payloads.rb   | 2 +-
 .../background_migration/populate_untracked_uploads_dependencies.rb | 2 +-
 lib/gitlab/bare_repository_import/importer.rb                       | 2 +-
 lib/gitlab/bitbucket_import/importer.rb                             | 2 +-
 lib/gitlab/bitbucket_server_import/importer.rb                      | 2 +-
 lib/gitlab/ci/ansi2html.rb                                          | 2 +-
 lib/gitlab/ci/build/artifacts/metadata.rb                           | 2 +-
 lib/gitlab/ci/build/artifacts/metadata/entry.rb                     | 2 +-
 lib/gitlab/cycle_analytics/plan_event_fetcher.rb                    | 4 ++--
 lib/gitlab/database/count/tablesample_count_strategy.rb             | 2 +-
 lib/gitlab/diff/file.rb                                             | 2 +-
 lib/gitlab/email/reply_parser.rb                                    | 2 +-
 lib/gitlab/fogbugz_import/importer.rb                               | 2 +-
 lib/gitlab/git/commit.rb                                            | 4 ++--
 lib/gitlab/git/repository.rb                                        | 2 +-
 lib/gitlab/git/tree.rb                                              | 2 +-
 lib/gitlab/gitaly_client.rb                                         | 6 +++---
 lib/gitlab/gitaly_client/blob_service.rb                            | 2 +-
 lib/gitlab/gitaly_client/operation_service.rb                       | 2 +-
 lib/gitlab/highlight.rb                                             | 2 +-
 lib/gitlab/i18n/metadata_entry.rb                                   | 2 +-
 lib/gitlab/import_export/json_hash_builder.rb                       | 2 +-
 lib/gitlab/import_export/relation_factory.rb                        | 2 +-
 lib/gitlab/incoming_email.rb                                        | 2 +-
 lib/gitlab/legacy_github_import/client.rb                           | 2 +-
 lib/gitlab/legacy_github_import/user_formatter.rb                   | 4 ++--
 lib/gitlab/sql/pattern.rb                                           | 2 +-
 lib/gitlab/tracing/jaeger_factory.rb                                | 2 +-
 lib/gitlab/tree_summary.rb                                          | 2 +-
 lib/system_check/app/git_user_default_ssh_config_check.rb           | 2 +-
 36 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'lib')

diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb
index d00e61678b5..94b58a64d26 100644
--- a/lib/api/helpers/pagination.rb
+++ b/lib/api/helpers/pagination.rb
@@ -149,7 +149,7 @@ module API
         def conditions(pagination)
           fields = pagination.fields
 
-          return nil if fields.empty?
+          return if fields.empty?
 
           placeholder = fields.map { '?' }
 
diff --git a/lib/bitbucket_server/collection.rb b/lib/bitbucket_server/collection.rb
index 7e4b2277bbe..f549acbd87f 100644
--- a/lib/bitbucket_server/collection.rb
+++ b/lib/bitbucket_server/collection.rb
@@ -25,13 +25,13 @@ module BitbucketServer
     end
 
     def prev_page
-      return nil unless current_page > 1
+      return unless current_page > 1
 
       current_page - 1
     end
 
     def next_page
-      return nil unless has_next_page?
+      return unless has_next_page?
 
       current_page + 1
     end
diff --git a/lib/declarative_policy/rule.rb b/lib/declarative_policy/rule.rb
index f38f4f0a50f..964d35cde9e 100644
--- a/lib/declarative_policy/rule.rb
+++ b/lib/declarative_policy/rule.rb
@@ -84,7 +84,7 @@ module DeclarativePolicy
       # returns nil unless it's already cached
       def cached_pass?(context)
         condition = context.condition(@name)
-        return nil unless condition.cached?
+        return unless condition.cached?
 
         condition.pass?
       end
@@ -124,7 +124,7 @@ module DeclarativePolicy
 
       def cached_pass?(context)
         condition = delegated_context(context).condition(@name)
-        return nil unless condition.cached?
+        return unless condition.cached?
 
         condition.pass?
       rescue MissingDelegate
@@ -161,7 +161,7 @@ module DeclarativePolicy
 
       def cached_pass?(context)
         runner = context.runner(@ability)
-        return nil unless runner.cached?
+        return unless runner.cached?
 
         runner.pass?
       end
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb
index dddba85e629..47d63eb53cf 100644
--- a/lib/gitlab/auth/ldap/config.rb
+++ b/lib/gitlab/auth/ldap/config.rb
@@ -195,7 +195,7 @@ module Gitlab
 
         def encryption_options
           method = translate_method
-          return nil unless method
+          return unless method
 
           {
             method: method,
@@ -211,7 +211,7 @@ module Gitlab
           return @tls_options if defined?(@tls_options)
 
           method = translate_method
-          return nil unless method
+          return unless method
 
           opts = if options['verify_certificates'] && method != 'plain'
                    # Dup so we don't accidentally overwrite the constant
diff --git a/lib/gitlab/auth/ldap/person.rb b/lib/gitlab/auth/ldap/person.rb
index 48d134f91b0..13d67e0f871 100644
--- a/lib/gitlab/auth/ldap/person.rb
+++ b/lib/gitlab/auth/ldap/person.rb
@@ -112,7 +112,7 @@ module Gitlab
           attributes = Array(config.attributes[attribute.to_s])
           selected_attr = attributes.find { |attr| entry.respond_to?(attr) }
 
-          return nil unless selected_attr
+          return unless selected_attr
 
           entry.public_send(selected_attr) # rubocop:disable GitlabSecurity/PublicSend
         end
diff --git a/lib/gitlab/auth/saml/auth_hash.rb b/lib/gitlab/auth/saml/auth_hash.rb
index 1af9fa40c3a..b0df9757bbd 100644
--- a/lib/gitlab/auth/saml/auth_hash.rb
+++ b/lib/gitlab/auth/saml/auth_hash.rb
@@ -10,11 +10,11 @@ module Gitlab
 
         def authn_context
           response_object = auth_hash.extra[:response_object]
-          return nil if response_object.blank?
+          return if response_object.blank?
 
           document = response_object.decrypted_document
           document ||= response_object.document
-          return nil if document.blank?
+          return if document.blank?
 
           extract_authn_context(document)
         end
diff --git a/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb b/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb
index 38fecac1bfe..42fcaa87e66 100644
--- a/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb
+++ b/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb
@@ -24,7 +24,7 @@ module Gitlab
         def commit_title
           commit = commits.last
 
-          return nil unless commit && commit[:message]
+          return unless commit && commit[:message]
 
           index = commit[:message].index("\n")
           message = index ? commit[:message][0..index] : commit[:message]
diff --git a/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb b/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
index 4a9a62aaeb5..a84f794bfae 100644
--- a/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
@@ -127,7 +127,7 @@ module Gitlab
 
           full_path = matchd[1]
           project = Gitlab::BackgroundMigration::PopulateUntrackedUploadsDependencies::Project.find_by_full_path(full_path)
-          return nil unless project
+          return unless project
 
           project.id
         end
diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
index 3cd327f5109..144ba2ec031 100644
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -108,7 +108,7 @@ module Gitlab
       end
 
       def find_or_create_groups
-        return nil unless group_path.present?
+        return unless group_path.present?
 
         log " * Using namespace: #{group_path}"
 
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 75a3f17f549..441fdec8a1e 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -47,7 +47,7 @@ module Gitlab
 
       # rubocop: disable CodeReuse/ActiveRecord
       def find_user_id(username)
-        return nil unless username
+        return unless username
 
         return users[username] if users.key?(username)
 
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index dbbedd5dcbe..4a789ae457f 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -65,7 +65,7 @@ module Gitlab
       end
 
       def find_user_id(email)
-        return nil unless email
+        return unless email
 
         return users[email] if users.key?(email)
 
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index 4dcb3869d4f..fba0de20ced 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -313,7 +313,7 @@ module Gitlab
 
         def get_term_color_class(color_index, prefix)
           color_name = COLOR[color_index]
-          return nil if color_name.nil?
+          return if color_name.nil?
 
           get_color_class(["term", prefix, color_name])
         end
diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb
index 08dac756cc1..d45a044686e 100644
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
@@ -103,7 +103,7 @@ module Gitlab
 
           def read_string(gz)
             string_size = read_uint32(gz)
-            return nil unless string_size
+            return unless string_size
 
             gz.read(string_size)
           end
diff --git a/lib/gitlab/ci/build/artifacts/metadata/entry.rb b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
index d0a80518ae8..80e69cdcc95 100644
--- a/lib/gitlab/ci/build/artifacts/metadata/entry.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
@@ -44,7 +44,7 @@ module Gitlab
             end
 
             def parent
-              return nil unless has_parent?
+              return unless has_parent?
 
               self.class.new(@path.to_s.chomp(basename), @entries)
             end
diff --git a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
index db8ac3becea..aeca9d00156 100644
--- a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
@@ -40,11 +40,11 @@ module Gitlab
       end
 
       def first_time_reference_commit(event)
-        return nil unless event && merge_request_diff_commits
+        return unless event && merge_request_diff_commits
 
         commits = merge_request_diff_commits[event['id'].to_i]
 
-        return nil if commits.blank?
+        return if commits.blank?
 
         commits.find do |commit|
           next unless commit[:committed_date] && event['first_mentioned_in_commit_at']
diff --git a/lib/gitlab/database/count/tablesample_count_strategy.rb b/lib/gitlab/database/count/tablesample_count_strategy.rb
index cf1cf054dbf..fedf6ca4fe1 100644
--- a/lib/gitlab/database/count/tablesample_count_strategy.rb
+++ b/lib/gitlab/database/count/tablesample_count_strategy.rb
@@ -36,7 +36,7 @@ module Gitlab
 
         def perform_count(model, estimate)
           # If we estimate 0, we may not have statistics at all. Don't use them.
-          return nil unless estimate && estimate > 0
+          return unless estimate && estimate > 0
 
           if estimate < EXACT_COUNT_THRESHOLD
             # The table is considered small, the assumption here is that
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index c9d89d56884..eac9bb88eb6 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -75,7 +75,7 @@ module Gitlab
       end
 
       def line_for_position(pos)
-        return nil unless pos.position_type == 'text'
+        return unless pos.position_type == 'text'
 
         # This method is normally used to find which line the diff was
         # commented on, and in this context, it's normally the raw diff persisted
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index 2743f011ca6..dc44e9d7481 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -61,7 +61,7 @@ module Gitlab
 
       # Force encoding to UTF-8 on a Mail::Message or Mail::Part
       def fix_charset(object)
-        return nil if object.nil?
+        return if object.nil?
 
         if object.charset
           object.body.decoded.force_encoding(object.charset.gsub(/utf8/i, "UTF-8")).encode("UTF-8").to_s
diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index 431911d1eee..2c53f9b026d 100644
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
@@ -239,7 +239,7 @@ module Gitlab
 
         res = ::Projects::DownloadService.new(project, link).execute
 
-        return nil if res.nil?
+        return if res.nil?
 
         res[:markdown]
       end
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index c5688cda565..491e4b47196 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -58,10 +58,10 @@ module Gitlab
           return commit_id if commit_id.is_a?(Gitlab::Git::Commit)
 
           # Some weird thing?
-          return nil unless commit_id.is_a?(String)
+          return unless commit_id.is_a?(String)
 
           # This saves us an RPC round trip.
-          return nil if commit_id.include?(':')
+          return if commit_id.include?(':')
 
           commit = find_commit(repo, commit_id)
 
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 2f8e4e9e93d..7750978fb95 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -276,7 +276,7 @@ module Gitlab
       # senddata response.
       def archive_file_path(storage_path, sha, name, format = "tar.gz")
         # Build file path
-        return nil unless name
+        return unless name
 
         extension =
           case format
diff --git a/lib/gitlab/git/tree.rb b/lib/gitlab/git/tree.rb
index 51542bcaaa2..6fcea4e12b4 100644
--- a/lib/gitlab/git/tree.rb
+++ b/lib/gitlab/git/tree.rb
@@ -44,7 +44,7 @@ module Gitlab
             entry[:name] == path_arr[0] && entry[:type] == :tree
           end
 
-          return nil unless entry
+          return unless entry
 
           if path_arr.size > 1
             path_arr.shift
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 869b835b61e..3e7e4f096ee 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -384,13 +384,13 @@ module Gitlab
 
     # Returns the stacks that calls Gitaly the most times. Used for n+1 detection
     def self.max_stacks
-      return nil unless Gitlab::SafeRequestStore.active?
+      return unless Gitlab::SafeRequestStore.active?
 
       stack_counter = Gitlab::SafeRequestStore[:stack_counter]
-      return nil unless stack_counter
+      return unless stack_counter
 
       max = max_call_count
-      return nil if max.zero?
+      return if max.zero?
 
       stack_counter.select { |_, v| v == max }.keys
     end
diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb
index 39547328210..6b8e58e6199 100644
--- a/lib/gitlab/gitaly_client/blob_service.rb
+++ b/lib/gitlab/gitaly_client/blob_service.rb
@@ -27,7 +27,7 @@ module Gitlab
           data << msg.data
         end
 
-        return nil if blob.oid.blank?
+        return if blob.oid.blank?
 
         data = data.join
 
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index bc45ee38fb5..2528208440e 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -62,7 +62,7 @@ module Gitlab
         end
 
         branch = response.branch
-        return nil unless branch
+        return unless branch
 
         target_commit = Gitlab::Git::Commit.decorate(@repository, branch.target_commit)
         Gitlab::Git::Branch.new(@repository, branch.name, target_commit.id, target_commit)
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb
index a4e60bbd828..381f1dd4e55 100644
--- a/lib/gitlab/highlight.rb
+++ b/lib/gitlab/highlight.rb
@@ -39,7 +39,7 @@ module Gitlab
     private
 
     def custom_language
-      return nil unless @language
+      return unless @language
 
       Rouge::Lexer.find_fancy(@language)
     end
diff --git a/lib/gitlab/i18n/metadata_entry.rb b/lib/gitlab/i18n/metadata_entry.rb
index 3764e379681..4facd10bfc8 100644
--- a/lib/gitlab/i18n/metadata_entry.rb
+++ b/lib/gitlab/i18n/metadata_entry.rb
@@ -15,7 +15,7 @@ module Gitlab
       end
 
       def expected_forms
-        return nil unless plural_information
+        return unless plural_information
 
         plural_information['nplurals'].to_i
       end
diff --git a/lib/gitlab/import_export/json_hash_builder.rb b/lib/gitlab/import_export/json_hash_builder.rb
index 477499e1688..b145f37c052 100644
--- a/lib/gitlab/import_export/json_hash_builder.rb
+++ b/lib/gitlab/import_export/json_hash_builder.rb
@@ -67,7 +67,7 @@ module Gitlab
       # +value+ existing model to be included in the hash
       # +parsed_hash+ the original hash
       def parse_hash(value)
-        return nil if already_contains_methods?(value)
+        return if already_contains_methods?(value)
 
         @attributes_finder.parse(value) do |hash|
           { include: hash_or_merge(value, hash) }
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 099b488f68e..61a1aa6da5a 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -75,7 +75,7 @@ module Gitlab
       # the relation_hash, updating references with new object IDs, mapping users using
       # the "members_mapper" object, also updating notes if required.
       def create
-        return nil if unknown_service?
+        return if unknown_service?
 
         setup_models
 
diff --git a/lib/gitlab/incoming_email.rb b/lib/gitlab/incoming_email.rb
index cc0c633b943..8b346f6d7d2 100644
--- a/lib/gitlab/incoming_email.rb
+++ b/lib/gitlab/incoming_email.rb
@@ -57,7 +57,7 @@ module Gitlab
 
       def address_regex
         wildcard_address = config.address
-        return nil unless wildcard_address
+        return unless wildcard_address
 
         regex = Regexp.escape(wildcard_address)
         regex = regex.sub(Regexp.escape(WILDCARD_PLACEHOLDER), '(.+)')
diff --git a/lib/gitlab/legacy_github_import/client.rb b/lib/gitlab/legacy_github_import/client.rb
index bc952147667..bbdd094e33b 100644
--- a/lib/gitlab/legacy_github_import/client.rb
+++ b/lib/gitlab/legacy_github_import/client.rb
@@ -68,7 +68,7 @@ module Gitlab
       end
 
       def user(login)
-        return nil unless login.present?
+        return unless login.present?
         return @users[login] if @users.key?(login)
 
         @users[login] = api.user(login)
diff --git a/lib/gitlab/legacy_github_import/user_formatter.rb b/lib/gitlab/legacy_github_import/user_formatter.rb
index ec0e221b1ff..889e6aaa968 100644
--- a/lib/gitlab/legacy_github_import/user_formatter.rb
+++ b/lib/gitlab/legacy_github_import/user_formatter.rb
@@ -25,7 +25,7 @@ module Gitlab
       end
 
       def find_by_email
-        return nil unless email
+        return unless email
 
         User.find_by_any_email(email)
             .try(:id)
@@ -33,7 +33,7 @@ module Gitlab
 
       # rubocop: disable CodeReuse/ActiveRecord
       def find_by_external_uid
-        return nil unless id
+        return unless id
 
         identities = ::Identity.arel_table
 
diff --git a/lib/gitlab/sql/pattern.rb b/lib/gitlab/sql/pattern.rb
index 92388262035..07d0acdbae9 100644
--- a/lib/gitlab/sql/pattern.rb
+++ b/lib/gitlab/sql/pattern.rb
@@ -33,7 +33,7 @@ module Gitlab
         #                     `LOWER(column) = query` instead of using `ILIKE`.
         def fuzzy_arel_match(column, query, lower_exact_match: false)
           query = query.squish
-          return nil unless query.present?
+          return unless query.present?
 
           words = select_fuzzy_words(query)
 
diff --git a/lib/gitlab/tracing/jaeger_factory.rb b/lib/gitlab/tracing/jaeger_factory.rb
index 2682007302a..93520d5667b 100644
--- a/lib/gitlab/tracing/jaeger_factory.rb
+++ b/lib/gitlab/tracing/jaeger_factory.rb
@@ -60,7 +60,7 @@ module Gitlab
         elsif udp_endpoint.present?
           sender = get_udp_sender(encoder, udp_endpoint)
         else
-          return nil
+          return
         end
 
         Jaeger::Reporters::RemoteReporter.new(
diff --git a/lib/gitlab/tree_summary.rb b/lib/gitlab/tree_summary.rb
index 453d78e2f7b..8518a13cd1c 100644
--- a/lib/gitlab/tree_summary.rb
+++ b/lib/gitlab/tree_summary.rb
@@ -95,7 +95,7 @@ module Gitlab
     end
 
     def cache_commit(commit)
-      return nil unless commit.present?
+      return unless commit.present?
 
       resolved_commits[commit.id] ||= commit
     end
diff --git a/lib/system_check/app/git_user_default_ssh_config_check.rb b/lib/system_check/app/git_user_default_ssh_config_check.rb
index 6cd53779bfd..a331f88873b 100644
--- a/lib/system_check/app/git_user_default_ssh_config_check.rb
+++ b/lib/system_check/app/git_user_default_ssh_config_check.rb
@@ -53,7 +53,7 @@ module SystemCheck
       end
 
       def ssh_dir
-        return nil unless home_dir
+        return unless home_dir
 
         File.join(home_dir, '.ssh')
       end
-- 
cgit v1.2.3