Commit a815fca7 authored by Greg Myers's avatar Greg Myers Committed by Alessandro Rodi
Browse files

Use ActiveSupport standard loader (#495)

Use ActiveSupport standard loader
parent bba63bb2
......@@ -4,6 +4,10 @@ Unreleased
* Removed support for dynamic finders (coorasse)
* Fix cancancan#478 - Fixes SQL exception from rails 5.2 upgrade (lizzyaustad & kevintyll)
2.1.4 (Apr 09th, 2018)
* Inject cancancan in ActionController::API and ActionController::Base when they are both defined (arturoherrero)
2.1.3 (Jan 16th, 2018)
* Fix compatibility with Rails 5 API (Eric-Guo)
......
......@@ -237,7 +237,7 @@ If you find a bug please add an [issue on GitHub](https://github.com/CanCanCommu
CanCanCan uses [appraisals](https://github.com/thoughtbot/appraisal) to test the code base against multiple versions
of Rails, as well as the different model adapters.
When first developing, you may need to run `bundle install` and then `appraisal install`, to install the different sets.
When first developing, you need to run `bundle install` and then `appraisal install`, to install the different sets.
You can then run all appraisal files (like CI does), with `appraisal rake` or just run a specific set `appraisal activerecord_5.0 rake`.
......@@ -249,7 +249,7 @@ See the [CONTRIBUTING](https://github.com/CanCanCommunity/cancancan/blob/develop
[![Renuo AG](/logo/renuo.png)](https://www.renuo.ch)
Thanks to [Renuo](https://www.renuo.ch) for currently maintaining and supporting the project.
Thanks to [Renuo AG](https://www.renuo.ch) for currently maintaining and supporting the project.
Also many thanks to the [CanCanCan contributors](https://github.com/CanCanCommunity/cancancan/contributors).
See the [CHANGELOG](https://github.com/CanCanCommunity/cancancan/blob/master/CHANGELOG.rdoc) for the full list.
......
......@@ -384,12 +384,6 @@ module CanCan
end
end
if defined? ActionController::Base
ActionController::Base.class_eval do
include CanCan::ControllerAdditions
end
elsif defined? ActionController::API
ActionController::API.class_eval do
include CanCan::ControllerAdditions
end
ActiveSupport.on_load(:action_controller) do
include CanCan::ControllerAdditions
end
module CanCan
VERSION = '2.1.3'.freeze
VERSION = '2.1.4'.freeze
end
logo/renuo.png

7.33 KB | W: | H:

logo/renuo.png

5.33 KB | W: | H:

logo/renuo.png
logo/renuo.png
logo/renuo.png
logo/renuo.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment