diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 09:10:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 09:10:46 +0000 |
| commit | acb7721fe807a75860f4be0a3bb50146232fa229 (patch) | |
| tree | e4d5d3eaf5102b6ac9770bc42d44a058143a8d47 /config | |
| parent | ac584d6b086691ad6b496c082a80bc78b8f08a22 (diff) | |
| parent | bd12ca5eb3c8b6ca9de28cbbb074ff1e29c661f2 (diff) | |
| download | gitlab-ce-acb7721fe807a75860f4be0a3bb50146232fa229.tar.gz | |
Merge branch 'rs-teaspoon' into 'master'
Add Teaspoon for Javascript testing
Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.
See https://github.com/modeset/teaspoon
See merge request !715
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/6_rack_profiler.rb | 3 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb index 38a5fa98dc2..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 << '/specs' + Rack::MiniProfiler.config.skip_paths << '/teaspoon' end diff --git a/config/routes.rb b/config/routes.rb index 3f8f920963d..b7380254abb 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', |