Add latest changes from gitlab-org/gitlab@master

4 files changed, 5 insertions, 5 deletions

diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 3320405e9e9..1d0b37abf72 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -73,7 +73,7 @@ class HipchatService < Service
   private
 
   def gate
-    options = { api_version: api_version.present? ? api_version : 'v2' }
+    options = { api_version: api_version.presence || 'v2' }
     options[:server_url] = server unless server.blank?
     @gate ||= HipChat::Client.new(token, options)
   end
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index fb76bc89c98..4a6c8339625 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -36,8 +36,8 @@ class IrkerService < Service
 
   def settings
     {
-      server_host: server_host.present? ? server_host : 'localhost',
-      server_port: server_port.present? ? server_port : 6659
+      server_host: server_host.presence || 'localhost',
+      server_port: server_port.presence || 6659
     }
   end
 
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 4a02da975f2..cfdf55b5155 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -337,7 +337,7 @@ class JiraService < IssueTrackerService
   end
 
   def client_url
-    api_url.present? ? api_url : url
+    api_url.presence || url
   end
 
   def reset_password?
diff --git a/app/models/project_services/packagist_service.rb b/app/models/project_services/packagist_service.rb
index 003884bb7ac..35dbedd1341 100644
--- a/app/models/project_services/packagist_service.rb
+++ b/app/models/project_services/packagist_service.rb
@@ -59,7 +59,7 @@ class PackagistService < Service
   end
 
   def hook_url
-    base_url = server.present? ? server : 'https://packagist.org'
+    base_url = server.presence || 'https://packagist.org'
     "#{base_url}/api/update-package?username=#{username}&apiToken=#{token}"
   end
 end