From 119152c5dc3c0490bc5585327b6018e65ed3494e Mon Sep 17 00:00:00 2001 From: squidgetx Date: Tue, 24 Feb 2015 20:21:15 -0500 Subject: [PATCH] Fixes Rails Admin bug remove mini profiler message rubocop remove legacy association fix dumb bug --- app/models/equipment_model.rb | 1 - config/environments/development.rb | 4 ++++ config/initializers/rails_admin.rb | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/equipment_model.rb b/app/models/equipment_model.rb index 2b17923e2..27897a384 100644 --- a/app/models/equipment_model.rb +++ b/app/models/equipment_model.rb @@ -19,7 +19,6 @@ class EquipmentModel < ActiveRecord::Base belongs_to :category has_and_belongs_to_many :requirements has_many :equipment_items, dependent: :destroy - has_many :documents has_many :reservations has_many :checkin_procedures, dependent: :destroy accepts_nested_attributes_for :checkin_procedures, \ diff --git a/config/environments/development.rb b/config/environments/development.rb index d48a355af..788ab2163 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -53,5 +53,9 @@ # Bullet.bugsnag = true # Bullet.add_footer = true # Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ] + + # Disable Rack Mini Profiler in certain parts of the application + Rack::MiniProfiler.config.skip_paths ||= [] + Rack::MiniProfiler.config.skip_paths << '/admin' end end diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 5e046e172..0a7195b8e 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -34,7 +34,7 @@ # Include only models we care about config.included_models = - %w(Announcement, AppConfig, Blackout, Category, CheckinProcedure, - CheckoutProcedure, EquipmentModel, EquipmentItem, Requirement, - Reservation, User) + [Announcement, AppConfig, Blackout, Category, CheckinProcedure, + CheckoutProcedure, EquipmentModel, EquipmentItem, Requirement, + Reservation, User] end