Commit 68a8dda6 authored by Arturo Herrero's avatar Arturo Herrero

Combine different hashes in the same merge

parent bac2a25f
...@@ -358,14 +358,13 @@ module Gitlab ...@@ -358,14 +358,13 @@ module Gitlab
# rubocop: disable UsageData/LargeTable: # rubocop: disable UsageData/LargeTable:
Service.available_services_names.each_with_object({}) do |service_name, response| Service.available_services_names.each_with_object({}) do |service_name, response|
response["projects_#{service_name}_active".to_sym] = count(Service.active.where(template: false, type: "#{service_name}_service".camelize)) response["projects_#{service_name}_active".to_sym] = count(Service.active.where(template: false, type: "#{service_name}_service".camelize))
end.merge(jira_usage).merge(jira_import_usage) end.merge(jira_usage, jira_import_usage)
# rubocop: enable UsageData/LargeTable: # rubocop: enable UsageData/LargeTable:
end end
def jira_usage def jira_usage
# Jira Cloud does not support custom domains as per https://jira.atlassian.com/browse/CLOUD-6999 # Jira Cloud does not support custom domains as per https://jira.atlassian.com/browse/CLOUD-6999
# so we can just check for subdomains of atlassian.net # so we can just check for subdomains of atlassian.net
results = { results = {
projects_jira_server_active: 0, projects_jira_server_active: 0,
projects_jira_cloud_active: 0 projects_jira_cloud_active: 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment