diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-06 16:50:47 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-28 18:22:32 -0400 |
| commit | 05aa71ccd965d3c366d50231a6b1b29f05aba373 (patch) | |
| tree | 54263a81f299927646e20a1f3b11a6b34b6dc703 /config | |
| parent | 51888f746c8afe43c5fed90c8013a03788821099 (diff) | |
| download | gitlab-ce-05aa71ccd965d3c366d50231a6b1b29f05aba373.tar.gz | |
Remove jasmine-rails; add teaspoon
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/6_rack_profiler.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 1 insertions, 2 deletions
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', |