Merge pull request #1171 from YaleSTC/1122_rails_admin

resolves #1122
YaleSTC · Mar 23, 2015 · 4405f6e · 4405f6e
2 parents 0e9370a + 119152c
commit 4405f6e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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