diff --git a/Gemfile b/Gemfile index 48b7a37aef..fa5fc715a3 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'omniauth' gem 'omniauth-github' # Permission -gem 'cancancan' +gem 'cancancan', git: 'https://github.com/Eric-Guo/cancancan', branch: :develop # Redis gem 'redis' diff --git a/Gemfile.lock b/Gemfile.lock index a146ee2133..75175d08a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/Eric-Guo/cancancan + revision: 5ae12b0b8acf9f430f4a306af4a921f6ad5a9c93 + branch: develop + specs: + cancancan (2.1.1) + GEM remote: https://gems.ruby-china.org/ specs: @@ -62,7 +69,6 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - cancancan (2.0.0) capybara (2.16.0) addressable mini_mime (>= 0.1.3) @@ -336,7 +342,7 @@ GEM rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) - rspec-rails (3.7.1) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -426,7 +432,7 @@ GEM websocket-extensions (0.1.3) xpath (2.1.0) nokogiri (~> 1.3) - yard (0.9.9) + yard (0.9.10) PLATFORMS ruby @@ -437,7 +443,7 @@ DEPENDENCIES better_errors bulk_insert bundler-audit - cancancan + cancancan! capybara carrierwave carrierwave-aliyun