Merge branch 'add-eeu-to-usage-ping' into 'master'

Record EEU usage pings correctly See merge request gitlab-org/gitlab-ee!3765

Merge branch 'add-eeu-to-usage-ping' into 'master'
Record EEU usage pings correctly See merge request gitlab-org/gitlab-ee!3765
eda7f65b · Douwe Maan · 5babea68 · 19b15470 · eda7f65b · eda7f65b
Commit eda7f65b authored Dec 14, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

changelogs/unreleased-ee/add-eeu-to-usage-ping.yml changelogs/unreleased-ee/add-eeu-to-usage-ping.yml +5 -0

lib/gitlab/usage_data.rb lib/gitlab/usage_data.rb +2 -0

No files found.
--- a/changelogs/unreleased-ee/add-eeu-to-usage-ping.yml
+++ b/changelogs/unreleased-ee/add-eeu-to-usage-ping.yml
+---
+title: Record EE Ultimate usage pings correctly
+merge_request:
+author:
+type: fixed
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -140,6 +140,8 @@ module Gitlab
      def license_edition(plan)
        case plan
+        when 'ultimate'
+          'EEU'
        when 'premium'
          'EEP'
        when 'starter'