diff options
| author | Luc Donnet | 2017-11-30 21:58:52 +0100 |
|---|---|---|
| committer | Luc Donnet | 2017-11-30 21:58:52 +0100 |
| commit | 69a6bd72fecad790edab7e51e7d6df5ac1c7abba (patch) | |
| tree | dc11c5b787d6f9059c36cc9be56e2b1fcb1c64b0 /app/controllers/calendars_controller.rb | |
| parent | 3f5ac4764b859f97f776df565599e312b4584a03 (diff) | |
| parent | 887a5985c6aba4ae65fbdd7c0c40f30186a778f2 (diff) | |
| download | chouette-core-69a6bd72fecad790edab7e51e7d6df5ac1c7abba.tar.bz2 | |
Merge branch 'master' into 5093-fix_import_policy
Diffstat (limited to 'app/controllers/calendars_controller.rb')
| -rw-r--r-- | app/controllers/calendars_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index e9ee7579a..2ed10a111 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -1,4 +1,4 @@ -class CalendarsController < InheritedResources::Base +class CalendarsController < ChouetteController include PolicyChecker defaults resource_class: Calendar before_action :ransack_contains_date, only: [:index] |