summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-07-12 05:53:38 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-07-12 05:53:38 +0000
commit0b71325dc00ac459636625e743133c0bc0b4cb33 (patch)
treeb64312ae882513d685eab365db64d9ac09c07506
parentf9d8bd6b22b3d7f2bcab133deb5e1e727c32d8cc (diff)
parent04af424babefc4509f99fba645611992cfd6600d (diff)
downloadgitlab-ce-0b71325dc00ac459636625e743133c0bc0b4cb33.tar.gz
Merge branch 'group-analytics-frame' into 'master'
Port EE analytics route See merge request gitlab-org/gitlab-ce!30586
-rw-r--r--config/routes.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 50bb092ec2e..d208df62b4a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
@@ -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