Merge pull request #441 from differentreality/cancancan

Cancancan
2014-08-15 12:00:35 +02:00 · 2014-08-15 12:00:35 +02:00 · 566382eca8
commit 566382eca8
parent b89432aff7 88f613ef8c
128 changed files with 1710 additions and 908 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -299,6 +299,7 @@ GEM
    request_store (1.0.6)
    rest-client (1.6.7)
      mime-types (>= 1.16)
+    rolify (3.4.0)
    rspec (3.0.0)
      rspec-core (~> 3.0.0)
      rspec-expectations (~> 3.0.0)
@ -445,6 +446,7 @@ DEPENDENCIES
  rails-observers
  rdoc-generator-fivefish
  redcarpet
+  rolify
  rspec-activemodel-mocks
  rspec-rails
  rubocop