Permalink
Browse files

Necessary modifications for decl_auth lib tree restructuring

  • Loading branch information...
1 parent 080cf0c commit c8b15151f4f74951b14571219673956375dfdf3a @stffn committed Mar 5, 2009
Showing with 7 additions and 21 deletions.
  1. +5 −19 config/environment.rb
  2. +1 −1 test/test_helper.rb
  3. +1 −1 vendor/plugins/declarative_authorization
View
@@ -11,28 +11,14 @@
require File.join(File.dirname(__FILE__), 'boot')
Rails::Initializer.run do |config|
- # Settings in config/environments/* take precedence over those specified here.
- # Application configuration should go into files in config/initializers
- # -- all .rb files in that directory are automatically loaded.
- # See Rails::Configuration for more options.
-
- # Skip frameworks you're not going to use. To use Rails without a database
- # you must remove the Active Record framework.
- # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
# Specify gems that this application depends on.
# They can then be installed with "rake gems:install" on new installations.
- # config.gem "bj"
- # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
- # config.gem "aws-s3", :lib => "aws/s3"
-
- # Only load the plugins named here, in the order given. By default, all plugins
- # in vendor/plugins are loaded in alphabetical order.
- # :all can be used as a placeholder for all plugins not explicitly named
- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
- # Add additional load paths for your own custom dirs
- # config.load_paths += %W( #{RAILS_ROOT}/extras )
+ #
+ # Instead of using the git submodule with the declarative_authorization plugin
+ # in vendor/plugins/declarative_authorization, you may also use the plugin's
+ # gem:
+ #config.gem "stffn-declarative_authorization", :lib => "declarative_authorization"
# Force all environments to use the same logger level
# (by default production uses :info, the others :debug)
View
@@ -3,7 +3,7 @@
require 'test_help'
# For declarative_authorization test helpers
require File.expand_path(File.dirname(__FILE__) +
- "/../vendor/plugins/declarative_authorization/lib/maintenance")
+ "/../vendor/plugins/declarative_authorization/lib/declarative_authorization/maintenance")
class ActiveSupport::TestCase
# We need to include the declarative_authorization helpers

0 comments on commit c8b1515

Please sign in to comment.