summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-07 23:51:13 +0200
committerRémy Coutable <remy@rymai.me>2017-06-09 17:21:39 +0200
commitb173ae6b48323b22f5650e97cd797fa9c49e6cd8 (patch)
tree9c1266742aa0b8e785fab9a6054b32d4029ba22e /config
parentaf0c69170695f43b15db9c93ae2f2b8ebaaa96b6 (diff)
downloadgitlab-ce-b173ae6b48323b22f5650e97cd797fa9c49e6cd8.tar.gz
Fix linting, route, and specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r--config/initializers/peek.rb2
-rw-r--r--config/routes.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb
index c88ae4b62d2..c1c65cedccf 100644
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -17,6 +17,7 @@ Peek.into Peek::Views::Sidekiq
Peek.into Peek::Views::Rblineprof
Peek.into Peek::Views::GC
+# rubocop:disable Style/ClassAndModuleCamelCase
class PEEK_DB_CLIENT
class << self
attr_accessor :query_details
@@ -24,5 +25,4 @@ class PEEK_DB_CLIENT
self.query_details = Concurrent::Array.new
end
-# rubocop:disable Style/ClassAndModuleCamelCase
PEEK_DB_VIEW.prepend ::Gitlab::PerformanceBar::PeekQueryTracker
diff --git a/config/routes.rb b/config/routes.rb
index 9a117711083..4fd6cb5d439 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,7 +11,6 @@ Rails.application.routes.draw do
post :toggle_award_emoji, on: :member
end
- mount Peek::Railtie => '/peek'
draw :sherlock
draw :development
draw :ci
@@ -43,6 +42,7 @@ Rails.application.routes.draw do
get 'liveness' => 'health#liveness'
get 'readiness' => 'health#readiness'
resources :metrics, only: [:index]
+ mount Peek::Railtie => '/peek'
end
# Koding route