From 708d6a31efe43afade3c84240c7454a794f8d07d Mon Sep 17 00:00:00 2001 From: Alex Buijs Date: Thu, 1 Aug 2019 21:45:53 +0200 Subject: Rename snowplow collector's uri to hostname Rename snowplow_collector_uri to snowplow_collector_hostname in the application_settings table and in the code --- ee/lib/ee/api/helpers/settings_helpers.rb | 2 +- ee/lib/gitlab/snowplow_tracker.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ee/lib') diff --git a/ee/lib/ee/api/helpers/settings_helpers.rb b/ee/lib/ee/api/helpers/settings_helpers.rb index e9b9cc95ad0..df94a0b23fa 100644 --- a/ee/lib/ee/api/helpers/settings_helpers.rb +++ b/ee/lib/ee/api/helpers/settings_helpers.rb @@ -38,7 +38,7 @@ module EE optional :snowplow_enabled, type: Grape::API::Boolean, desc: 'Enable Snowplow' given snowplow_enabled: ->(val) { val } do - requires :snowplow_collector_uri, type: String, desc: 'Snowplow Collector URI' + requires :snowplow_collector_hostname, type: String, desc: 'Snowplow Collector Hostname' optional :snowplow_cookie_domain, type: String, desc: 'Snowplow cookie domain' optional :snowplow_site_id, type: String, desc: 'Snowplow Site/Application ID' end diff --git a/ee/lib/gitlab/snowplow_tracker.rb b/ee/lib/gitlab/snowplow_tracker.rb index 49d08656a05..9f12513e09e 100644 --- a/ee/lib/gitlab/snowplow_tracker.rb +++ b/ee/lib/gitlab/snowplow_tracker.rb @@ -24,7 +24,7 @@ module Gitlab end def emitter - ::SnowplowTracker::Emitter.new(Gitlab::CurrentSettings.snowplow_collector_uri) + ::SnowplowTracker::Emitter.new(Gitlab::CurrentSettings.snowplow_collector_hostname) end def enabled? -- cgit v1.2.1