Skip to content
Snippets Groups Projects
Commit 0b71325d authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge branch 'group-analytics-frame' into 'master'

Port EE analytics route

See merge request gitlab-org/gitlab-ce!30586
parents f9d8bd6b 04af424b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -110,6 +110,12 @@ Rails.application.routes.draw do
draw :jira_connect
end
 
Gitlab.ee do
constraints(::Constraints::FeatureConstrainer.new(:analytics)) do
draw :analytics
end
end
if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development?
resource :chaos, only: [] do
get :leakmem
Loading
Loading
@@ -119,6 +125,13 @@ Rails.application.routes.draw do
get :kill
end
end
if ENV['GITLAB_ENABLE_CHAOS_ENDPOINTS']
get '/chaos/leakmem' => 'chaos#leakmem'
get '/chaos/cpuspin' => 'chaos#cpuspin'
get '/chaos/sleep' => 'chaos#sleep'
get '/chaos/kill' => 'chaos#kill'
end
end
 
concern :clusterable do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment