diff --git a/.travis.yml b/.travis.yml index 2ace80f..9a6e0fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,19 +5,27 @@ services: - postgresql rvm: - - 2.2.0 + - 2.2.2 + - 2.3 + - 2.4 + - 2.5 + - 2.6 gemfile: - $REDMINE_PATH/Gemfile env: - - REDMINE_VER=3.1.6 DB=mysql - - REDMINE_VER=3.2.3 DB=mysql - - REDMINE_VER=3.3.0 DB=mysql - - - REDMINE_VER=3.1.6 DB=postgresql - - REDMINE_VER=3.2.3 DB=postgresql - - REDMINE_VER=3.3.0 DB=postgresql + - REDMINE_VER=4.0.0 DB=mysql + - REDMINE_VER=4.0.1 DB=mysql + - REDMINE_VER=4.0.2 DB=mysql + - REDMINE_VER=4.0.3 DB=mysql + - REDMINE_VER=4.0.4 DB=mysql + + - REDMINE_VER=4.0.0 DB=postgresql + - REDMINE_VER=4.0.1 DB=postgresql + - REDMINE_VER=4.0.2 DB=postgresql + - REDMINE_VER=4.0.3 DB=postgresql + - REDMINE_VER=4.0.4 DB=postgresql before_install: - export PLUGIN_NAME=redmine_custom_reports @@ -28,9 +36,9 @@ before_install: - cd $REDMINE_PATH before_script: - - bundle exec rake db:create - - bundle exec rake db:migrate - - bundle exec rake redmine:plugins:migrate + - bundle exec rails db:create + - bundle exec rails db:migrate + - bundle exec rails redmine:plugins:migrate script: - bundle exec ruby plugins/$PLUGIN_NAME/test/**/*_test.rb diff --git a/app/controllers/custom_reports_controller.rb b/app/controllers/custom_reports_controller.rb index 7b53775..ebb41b9 100644 --- a/app/controllers/custom_reports_controller.rb +++ b/app/controllers/custom_reports_controller.rb @@ -1,11 +1,11 @@ class CustomReportsController < ApplicationController unloadable - before_filter :find_project_by_project_id - before_filter :authorize - before_filter :find_custom_reports, only: [:index, :show, :new, :edit] - before_filter :find_custom_report, only: [:show, :edit, :update, :destroy] - before_filter :authorize_to_manage, only: [:edit, :update, :destroy] + before_action :find_project_by_project_id + before_action :authorize + before_action :find_custom_reports, only: [:index, :show, :new, :edit] + before_action :find_custom_report, only: [:show, :edit, :update, :destroy] + before_action :authorize_to_manage, only: [:edit, :update, :destroy] helper :queries include QueriesHelper diff --git a/db/migrate/20121212125001_create_custom_reports.rb b/db/migrate/20121212125001_create_custom_reports.rb index 0f4d54f..514c744 100644 --- a/db/migrate/20121212125001_create_custom_reports.rb +++ b/db/migrate/20121212125001_create_custom_reports.rb @@ -1,4 +1,4 @@ -class CreateCustomReports < ActiveRecord::Migration +class CreateCustomReports < ActiveRecord::Migration[4.2] def self.up unless table_exists? :custom_reports create_table :custom_reports do |t| diff --git a/db/migrate/20121212125002_create_custom_report_series.rb b/db/migrate/20121212125002_create_custom_report_series.rb index 9f06771..ed2fcee 100644 --- a/db/migrate/20121212125002_create_custom_report_series.rb +++ b/db/migrate/20121212125002_create_custom_report_series.rb @@ -1,4 +1,4 @@ -class CreateCustomReportSeries < ActiveRecord::Migration +class CreateCustomReportSeries < ActiveRecord::Migration[4.2] def self.up unless table_exists? :custom_report_series create_table :custom_report_series do |t| diff --git a/db/migrate/20121212125003_remove_filters_from_custom_reports.rb b/db/migrate/20121212125003_remove_filters_from_custom_reports.rb index ea25177..ae2baa9 100644 --- a/db/migrate/20121212125003_remove_filters_from_custom_reports.rb +++ b/db/migrate/20121212125003_remove_filters_from_custom_reports.rb @@ -1,4 +1,4 @@ -class RemoveFiltersFromCustomReports < ActiveRecord::Migration +class RemoveFiltersFromCustomReports < ActiveRecord::Migration[4.2] def self.up if column_exists? :custom_reports, :filters remove_column :custom_reports, :filters diff --git a/lib/redmine_custom_reports.rb b/lib/redmine_custom_reports.rb index 1a15c5f..553ee10 100644 --- a/lib/redmine_custom_reports.rb +++ b/lib/redmine_custom_reports.rb @@ -1,4 +1,4 @@ -ActionDispatch::Callbacks.to_prepare do +ActiveSupport::Reloader.to_prepare do # Requiring plugin's controller and model require_dependency 'custom_report'