CE upstream
based on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3144 (not ready yet)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/assets/javascripts/dispatcher.js
both modified: app/assets/javascripts/main.js
both modified: doc/api/settings.md
both modified: lib/gitlab/usage_data.rb
both modified: spec/lib/gitlab/usage_data_spec.rb
Edited by Valery Sizov