From 128b1eae092e4ee9384c99a4ba72b9122fc17e89 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 7 Feb 2017 15:16:46 +0100
Subject: Update Rubocop to ruby 2.3

---
 lib/api/branches.rb                         | 2 +-
 lib/api/entities.rb                         | 4 +---
 lib/gitlab/ci/config/entry/configurable.rb  | 2 +-
 lib/gitlab/email/message/repository_push.rb | 4 ++--
 lib/gitlab/git/blob_snippet.rb              | 2 +-
 lib/gitlab/metrics.rb                       | 6 +++---
 6 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index be659fa4a6a..9331be1f7de 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -84,7 +84,7 @@ module 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
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b1ead48caf7..bedcd503724 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -382,9 +382,7 @@ module API
       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
 
diff --git a/lib/gitlab/ci/config/entry/configurable.rb b/lib/gitlab/ci/config/entry/configurable.rb
index 833ae4a0ff3..e05aca9881b 100644
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
@@ -58,7 +58,7 @@ module Gitlab
             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
diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index 0e3b65fceb4..6c69cd9e6a9 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -46,7 +46,7 @@ module Gitlab
         end
 
         def diffs_count
-          diffs.size if diffs
+          diffs&.size
         end
 
         def compare
@@ -58,7 +58,7 @@ module Gitlab
         end
 
         def compare_timeout
-          diffs.overflow? if diffs
+          diffs&.overflow?
         end
 
         def reverse_compare?
diff --git a/lib/gitlab/git/blob_snippet.rb b/lib/gitlab/git/blob_snippet.rb
index e98de57fc22..d7975f88aaa 100644
--- a/lib/gitlab/git/blob_snippet.rb
+++ b/lib/gitlab/git/blob_snippet.rb
@@ -13,7 +13,7 @@ module Gitlab
       end
 
       def data
-        lines.join("\n") if lines
+        lines&.join("\n")
       end
 
       def name
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 3d1ba33ec68..857e0abf710 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -112,7 +112,7 @@ module Gitlab
     def self.tag_transaction(name, value)
       trans = current_transaction
 
-      trans.add_tag(name, value) if trans
+      trans&.add_tag(name, value)
     end
 
     # Sets the action of the current transaction (if any)
@@ -121,7 +121,7 @@ module Gitlab
     def self.action=(action)
       trans = current_transaction
 
-      trans.action = action if trans
+      trans&.action = action
     end
 
     # Tracks an event.
@@ -130,7 +130,7 @@ module Gitlab
     def self.add_event(*args)
       trans = current_transaction
 
-      trans.add_event(*args) if trans
+      trans&.add_event(*args)
     end
 
     # Returns the prefix to use for the name of a series.
-- 
cgit v1.2.1