From 05aa71ccd965d3c366d50231a6b1b29f05aba373 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 6 May 2015 16:50:47 -0400 Subject: Remove jasmine-rails; add teaspoon --- config/initializers/6_rack_profiler.rb | 2 +- config/routes.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb index 38a5fa98dc2..59934e210fe 100644 --- a/config/initializers/6_rack_profiler.rb +++ b/config/initializers/6_rack_profiler.rb @@ -5,5 +5,5 @@ if Rails.env.development? Rack::MiniProfilerRails.initialize!(Rails.application) Rack::MiniProfiler.config.position = 'right' Rack::MiniProfiler.config.start_hidden = true - Rack::MiniProfiler.config.skip_paths << '/specs' + Rack::MiniProfiler.config.skip_paths << %w(/specs /teaspoon) end diff --git a/config/routes.rb b/config/routes.rb index bf2cb6421c5..567691a643e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,6 @@ require 'sidekiq/web' require 'api/api' Gitlab::Application.routes.draw do - mount JasmineRails::Engine => '/specs' if defined?(JasmineRails) use_doorkeeper do controllers applications: 'oauth/applications', authorized_applications: 'oauth/authorized_applications', -- cgit v1.2.3 From bd12ca5eb3c8b6ca9de28cbbb074ff1e29c661f2 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 23 May 2015 00:37:01 -0400 Subject: Disable Rack::MiniProfiler for /teaspoon path --- config/initializers/6_rack_profiler.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb index 59934e210fe..5312fd8e89a 100644 --- a/config/initializers/6_rack_profiler.rb +++ b/config/initializers/6_rack_profiler.rb @@ -3,7 +3,8 @@ if Rails.env.development? # initialization is skipped so trigger it Rack::MiniProfilerRails.initialize!(Rails.application) + Rack::MiniProfiler.config.position = 'right' Rack::MiniProfiler.config.start_hidden = true - Rack::MiniProfiler.config.skip_paths << %w(/specs /teaspoon) + Rack::MiniProfiler.config.skip_paths << '/teaspoon' end -- cgit v1.2.3