cancancan 2.1.2 → 2.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/cancancan.gemspec +1 -1
- data/lib/cancan/controller_additions.rb +7 -4
- data/lib/cancan/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: de52624409f514745004820cec9c89f9c0ce7bd8
|
|
4
|
+
data.tar.gz: aa37a4dc4a6ae653dc16011234c25836e0a91c95
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1c7fbce656e4036056222252e96b4990408ca98bc30af5d5a682b32e1903cab76852dea0e44a0d5a4eac731fd5eb95b2b3d527c48236b2463c2b4cc1fed2df20
|
|
7
|
+
data.tar.gz: 7bc3653619d6fa4b9b833736f4e9467128edb388310056859c82ac86e98382e4c250bcce72961072e2406240288e59bf66d3066fdd9b747f8d5d5c596e7611ab
|
data/cancancan.gemspec
CHANGED
|
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
|
|
|
18
18
|
s.files = `git ls-files lib init.rb cancancan.gemspec`.split($INPUT_RECORD_SEPARATOR)
|
|
19
19
|
s.require_paths = ['lib']
|
|
20
20
|
|
|
21
|
-
s.required_ruby_version = '>= 2.
|
|
21
|
+
s.required_ruby_version = '>= 2.2.0'
|
|
22
22
|
|
|
23
23
|
s.add_development_dependency 'bundler', '~> 1.3'
|
|
24
24
|
s.add_development_dependency 'rubocop', '~> 0.48.1'
|
|
@@ -384,9 +384,12 @@ module CanCan
|
|
|
384
384
|
end
|
|
385
385
|
end
|
|
386
386
|
|
|
387
|
-
if defined? ActionController
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
387
|
+
if defined? ActionController::Base
|
|
388
|
+
ActionController::Base.class_eval do
|
|
389
|
+
include CanCan::ControllerAdditions
|
|
390
|
+
end
|
|
391
|
+
elsif defined? ActionController::API
|
|
392
|
+
ActionController::API.class_eval do
|
|
393
|
+
include CanCan::ControllerAdditions
|
|
391
394
|
end
|
|
392
395
|
end
|
data/lib/cancan/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cancancan
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alessandro Rodi (Renuo AG)
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date:
|
|
14
|
+
date: 2018-01-16 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
147
147
|
requirements:
|
|
148
148
|
- - ">="
|
|
149
149
|
- !ruby/object:Gem::Version
|
|
150
|
-
version: 2.
|
|
150
|
+
version: 2.2.0
|
|
151
151
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
152
152
|
requirements:
|
|
153
153
|
- - ">="
|