Merge branch 'zj-ruby-2-1-no-more' into 'master'

[EE] Update Rubocop to Ruby 2.3

See merge request !1195

.rubocop.yml

@@ -5,7 +5,7 @@ require:
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
   # Cop names are not d§splayed in offense messages by default. Change behavior
   # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
   # option.

app/helpers/kerberos_spnego_helper.rb

@@ -46,7 +46,7 @@ def find_kerberos_user
     return unless krb_principal
     identity = ::Identity.find_by(provider: :kerberos, extern_uid: krb_principal)
-    identity.user if identity
+    identity&.user
   end
   # The Kerberos backend will translate spnego_token into a Kerberos

app/mailers/notify.rb

@@ -152,7 +152,7 @@ def mail_answer_thread(model, headers = {})
     headers['In-Reply-To'] = message_id(model)
     headers['References'] = message_id(model)
-    headers[:subject].prepend('Re: ') if headers[:subject]
+    headers[:subject]&.prepend('Re: ')
     mail_thread(model, headers)
   end

app/models/application_setting.rb

@@ -129,31 +129,25 @@ class ApplicationSetting < ActiveRecord::Base
             numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates_each :restricted_visibility_levels do |record, attr, value|
-    unless value.nil?
-      value.each do |level|
-        unless Gitlab::VisibilityLevel.options.has_value?(level)
-          record.errors.add(attr, "'#{level}' is not a valid visibility level")
-        end
+    value&.each do |level|
+      unless Gitlab::VisibilityLevel.options.has_value?(level)
+        record.errors.add(attr, "'#{level}' is not a valid visibility level")
       end
     end
   end
   validates_each :import_sources do |record, attr, value|
-    unless value.nil?
-      value.each do |source|
-        unless Gitlab::ImportSources.options.has_value?(source)
-          record.errors.add(attr, "'#{source}' is not a import source")
-        end
+    value&.each do |source|
+      unless Gitlab::ImportSources.options.has_value?(source)
+        record.errors.add(attr, "'#{source}' is not a import source")
       end
     end
   end
   validates_each :disabled_oauth_sign_in_sources do |record, attr, value|
-    unless value.nil?
-      value.each do |source|
-        unless Devise.omniauth_providers.include?(source.to_sym)
-          record.errors.add(attr, "'#{source}' is not an OAuth sign-in source")
-        end
+    value&.each do |source|
+      unless Devise.omniauth_providers.include?(source.to_sym)
+        record.errors.add(attr, "'#{source}' is not an OAuth sign-in source")
       end
     end
   end
@@ -255,11 +249,11 @@ def sidekiq_throttling_column_exists?
   end
   def domain_whitelist_raw
-    self.domain_whitelist.join("\n") unless self.domain_whitelist.nil?
+    self.domain_whitelist&.join("\n")
   end
   def domain_blacklist_raw
-    self.domain_blacklist.join("\n") unless self.domain_blacklist.nil?
+    self.domain_blacklist&.join("\n")
   end
   def domain_whitelist_raw=(values)

app/models/concerns/issuable.rb

@@ -98,8 +98,8 @@ def award_emojis_loaded?
     def update_assignee_cache_counts
       # make sure we flush the cache for both the old *and* new assignees(if they exist)
       previous_assignee = User.find_by_id(assignee_id_was) if assignee_id_was
-      previous_assignee.update_cache_counts if previous_assignee
-      assignee.update_cache_counts if assignee
+      previous_assignee&.update_cache_counts
+      assignee&.update_cache_counts
     end
     # We want to use optimistic lock for cases when only title or description are involved

app/models/concerns/milestoneish.rb

@@ -73,7 +73,7 @@ def count_issues_by_state(user)
   def memoize_per_user(user, method_name)
     @memoized ||= {}
     @memoized[method_name] ||= {}
-    @memoized[method_name][user.try!(:id)] ||= yield
+    @memoized[method_name][user&.id] ||= yield
   end
   # override in a class that includes this module to get a faster query

app/models/environment.rb

@@ -126,7 +126,7 @@ def stop_with_action!(current_user)
     return unless available?
     stop!
-    stop_action.play(current_user) if stop_action
+    stop_action&.play(current_user)
   end
   def actions_for(environment)

app/models/geo_node.rb

@@ -95,7 +95,7 @@ def build_dependents
   end
   def update_dependents_attributes
-    self.geo_node_key.title = "Geo node: #{self.url}" if self.geo_node_key
+    self.geo_node_key&.title = "Geo node: #{self.url}"
     if self.primary?
       self.oauth_application = nil

app/models/group_milestone.rb

@@ -9,7 +9,7 @@ def self.build_collection(group, projects, params)
   def self.build(group, projects, title)
     super(projects, title).tap do |milestone|
-      milestone.group = group if milestone
+      milestone&.group = group
     end
   end

app/models/repository.rb

@@ -945,9 +945,7 @@ def ff_merge(user, source, target_branch, merge_request: nil)
     GitOperationService.new(user, self).with_branch(
       target_branch) do |start_commit|
-      if merge_request
-        merge_request.update(in_progress_merge_commit_sha: their_commit.oid)
-      end
+      merge_request&.update(in_progress_merge_commit_sha: their_commit.oid)
       their_commit.oid
     end

app/models/user.rb

@@ -334,7 +334,7 @@ def find_by_username!(username)
     def find_by_personal_access_token(token_string)
       personal_access_token = PersonalAccessToken.active.find_by_token(token_string) if token_string
-      personal_access_token.user if personal_access_token
+      personal_access_token&.user
     end
     # Returns a user for the given SSH key.

app/models/wiki_page.rb

@@ -69,16 +69,12 @@ def title=(new_title)
   # The raw content of this page.
   def content
-    @attributes[:content] ||= if @page
-                                @page.text_data
-                              end
+    @attributes[:content] ||= @page&.text_data
   end
   # The processed/formatted content of this page.
   def formatted_content
-    @attributes[:formatted_content] ||= if @page
-                                          @page.formatted_data
-                                        end
+    @attributes[:formatted_content] ||= @page&.formatted_data
   end
   # The markup format for the page.

app/services/create_tag_service.rb

@@ -4,7 +4,7 @@ def execute(tag_name, target, message, release_description = nil)
     return error('Tag name invalid') unless valid_tag
     repository = project.repository
-    message.strip! if message
+    message&.strip!
     new_tag = nil

app/services/delete_tag_service.rb

@@ -9,7 +9,7 @@ def execute(tag_name)
     if repository.rm_tag(current_user, tag_name)
       release = project.releases.find_by(tag: tag_name)
-      release.destroy if release
+      release&.destroy
       push_data = build_push_data(tag)
       EventCreateService.new.push(project, current_user, push_data)

app/services/issues/create_service.rb

@@ -15,7 +15,7 @@ def execute
     def before_create(issuable)
       if @recaptcha_verified
         spam_log = current_user.spam_logs.find_by(id: @spam_log_id, title: issuable.title)
-        spam_log.update!(recaptcha_verified: true) if spam_log
+        spam_log&.update!(recaptcha_verified: true)
       else
         issuable.spam = spam_service.check(@api)
         issuable.spam_log = spam_service.spam_log

app/services/projects/create_service.rb

@@ -107,7 +107,7 @@ def after_create_actions
         project.push_rule = push_rule
       end
-      @project.group.refresh_members_authorized_projects if @project.group
+      @project.group&.refresh_members_authorized_projects
     end
     def skip_wiki?

app/workers/authorized_projects_worker.rb

@@ -16,6 +16,6 @@ def self.bulk_perform_async(args_list)
   def perform(user_id)
     user = User.find_by(id: user_id)
-    user.refresh_authorized_projects if user
+    user&.refresh_authorized_projects
   end
 end

lib/api/branches.rb

@@ -84,7 +84,7 @@ class Branches < Grape::API
         branch = user_project.repository.find_branch(params[:branch])
         not_found!("Branch") unless branch
         protected_branch = user_project.protected_branches.find_by(name: branch.name)
-        protected_branch.destroy if protected_branch
+        protected_branch&.destroy
         present branch, with: Entities::RepoBranch, project: user_project
       end

lib/api/entities.rb

@@ -429,9 +429,7 @@ class Event < Grape::Entity
       expose :author, using: Entities::UserBasic, if: ->(event, options) { event.author }
       expose :author_username do |event, options|
-        if event.author
-          event.author.username
-        end
+        event.author&.username
       end
     end

lib/gitlab/ci/config/entry/configurable.rb

@@ -58,7 +58,7 @@ def entry(key, entry, metadata)
             def helpers(*nodes)
               nodes.each do |symbol|
                 define_method("#{symbol}_defined?") do
-                  @entries[symbol].specified? if @entries[symbol]
+                  @entries[symbol]&.specified?
                 end
                 define_method("#{symbol}_value") do