Factored out access controls

samvera · Jun 11, 2012 · dcbf3e6 · dcbf3e6
1 parent deb3823
commit dcbf3e6
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 1,322 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
diff --git a/app/models/hydra/ability.rb b/app/models/hydra/ability.rb
diff --git a/app/models/hydra/datastream/rights_metadata.rb b/app/models/hydra/datastream/rights_metadata.rb
diff --git a/app/models/hydra/role_mapper_behavior.rb b/app/models/hydra/role_mapper_behavior.rb
diff --git a/app/models/role_mapper.rb b/app/models/role_mapper.rb
diff --git a/config/solr.yml b/config/solr.yml
@@ -2,7 +2,7 @@
 development:
   url: http://localhost:8983/solr/development
 test: &TEST
-  url: http://127.0.0.1:8983/solr/test
+  url: http://localhost:8983/solr/test
 cucumber:
   <<: *TEST
 production:

diff --git a/hydra-head.gemspec b/hydra-head.gemspec
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'RedCloth', '=4.2.9'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
-  s.add_dependency 'cancan'
   s.add_dependency 'hydra-mods', ">= 0.0.4"
   s.add_dependency 'deprecation'
   s.add_dependency 'jquery-rails'
+  s.add_dependency 'hydra-access-controls'
 
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'yard'