diff options
author | Rémy Coutable <remy@rymai.me> | 2017-05-17 13:20:55 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-09 17:21:39 +0200 |
commit | d39ecf1ca7e9455abcdeb17c251a2d248a47d471 (patch) | |
tree | 51c448694d2e5a29083555a1d78b34f17fd57ef7 /config | |
parent | 320590180703c620cedd6eb6023548dca2d026cf (diff) | |
download | gitlab-ce-d39ecf1ca7e9455abcdeb17c251a2d248a47d471.tar.gz |
New performance bar that can be enabled with the `p b` shortcut
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 1 | ||||
-rw-r--r-- | config/initializers/peek.rb | 9 | ||||
-rw-r--r-- | config/routes.rb | 1 | ||||
-rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index b0533759252..8bbecf3ed0f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,6 +105,7 @@ module Gitlab config.assets.precompile << "katex.css" config.assets.precompile << "katex.js" config.assets.precompile << "xterm/xterm.css" + config.assets.precompile << "peek.css" config.assets.precompile << "lib/ace.js" config.assets.precompile << "vendor/assets/fonts/*" config.assets.precompile << "test.css" diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb new file mode 100644 index 00000000000..73da7be7889 --- /dev/null +++ b/config/initializers/peek.rb @@ -0,0 +1,9 @@ +Rails.application.config.peek.adapter = :redis, { client: ::Redis.new(Gitlab::Redis.params) } + +Peek.into Peek::Views::Host +Peek.into Peek::Views::PerformanceBar +Peek.into Gitlab::Database.mysql? ? Peek::Views::Mysql2 : Peek::Views::PG +Peek.into Peek::Views::Redis +Peek.into Peek::Views::Sidekiq +Peek.into Peek::Views::Rblineprof +Peek.into Peek::Views::GC diff --git a/config/routes.rb b/config/routes.rb index d909be38b42..9a117711083 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,6 +11,7 @@ Rails.application.routes.draw do post :toggle_award_emoji, on: :member end + mount Peek::Railtie => '/peek' draw :sherlock draw :development draw :ci diff --git a/config/webpack.config.js b/config/webpack.config.js index 7501acb7633..bb77c12f88a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -68,6 +68,7 @@ var config = { raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', test: './test.js', + peek: './peek.js', }, output: { |