Permalink
Browse files

requiring controllers in dev mode (to auto-build routes) is messing u…

…p reloadability; limiting only to admin controllers
  • Loading branch information...
1 parent 4ddff53 commit 49e663eac1cb938a943790c9141c4fef5153644f Francis Hwang committed Nov 9, 2011
Showing with 9 additions and 7 deletions.
  1. +3 −1 config/routes.rb
  2. +3 −3 rails_3_0/Gemfile.lock
  3. +3 −3 rails_3_1/Gemfile.lock
View
@@ -4,7 +4,9 @@
controllers_path = "#{Rails.root}/app/controllers"
AdminAssistant.all_files_under(controllers_path).each do |path|
if path =~ /\.rb$/
- require path
+ if File.readlines(path).any? { |line| line =~ /admin_assistant_for/ }
+ require path
+ end
end
end
end
@@ -10,9 +10,9 @@ GIT
PATH
remote: ../../admin_assistant
specs:
- admin_assistant (2.2.0)
+ admin_assistant (2.2.2)
dynamic_form
- will_paginate (= 3.0)
+ will_paginate (~> 3.0)
GEM
remote: http://rubygems.org/
@@ -87,7 +87,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
- will_paginate (3.0.0)
+ will_paginate (3.0.2)
PLATFORMS
ruby
@@ -10,9 +10,9 @@ GIT
PATH
remote: ../../admin_assistant
specs:
- admin_assistant (2.2.0)
+ admin_assistant (2.2.2)
dynamic_form
- will_paginate (= 3.0)
+ will_paginate (~> 3.0)
GEM
remote: http://rubygems.org/
@@ -122,7 +122,7 @@ GEM
uglifier (1.0.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- will_paginate (3.0.0)
+ will_paginate (3.0.2)
PLATFORMS
ruby

0 comments on commit 49e663e

Please sign in to comment.