summaryrefslogtreecommitdiff
path: root/ee/lib
diff options
context:
space:
mode:
authorAlex Buijs <abuijs@gitlab.com>2019-08-01 21:45:53 +0200
committerAlex Buijs <abuijs@gitlab.com>2019-08-07 10:26:13 +0200
commit708d6a31efe43afade3c84240c7454a794f8d07d (patch)
treeb5aa82b808d1240d0f08637da11ba1db1656a474 /ee/lib
parent40c9876dd8038129bbda42ed47f7c5836b9f31ff (diff)
downloadgitlab-ce-708d6a31efe43afade3c84240c7454a794f8d07d.tar.gz
Rename snowplow collector's uri to hostname
Rename snowplow_collector_uri to snowplow_collector_hostname in the application_settings table and in the code
Diffstat (limited to 'ee/lib')
-rw-r--r--ee/lib/ee/api/helpers/settings_helpers.rb2
-rw-r--r--ee/lib/gitlab/snowplow_tracker.rb2
2 files changed, 2 insertions, 2 deletions
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?