Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cancancan v2.1.0+ break the testing suite #973

Closed
wants to merge 2 commits into from
Closed

Cancancan v2.1.0+ break the testing suite #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f74640
#973 cancancan version will break...
Eric-Guo Nov 20, 2017
3dfa627
#973 Using upstream fix
Eric-Guo Nov 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -437,7 +443,7 @@ DEPENDENCIES
better_errors
bulk_insert
bundler-audit
cancancan
cancancan!
capybara
carrierwave
carrierwave-aliyun
Expand Down