diff --git a/.travis.yml b/.travis.yml index d12ad3d1..5d9f0440 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: ruby sudo: false rvm: - - 2.2.2 + - 2.3 install: 'echo skip bundle install' diff --git a/after_init.rb b/after_init.rb index 21b64473..57a8f8a7 100644 --- a/after_init.rb +++ b/after_init.rb @@ -69,7 +69,7 @@ else end end -def prepare +ActionDispatch::Reloader.to_prepare do # Rubyzip configuration Zip.unicode_names = true @@ -81,13 +81,3 @@ def prepare Redmine::Activity.register :dmsf_file_revision_accesses, :default => false Redmine::Activity.register :dmsf_file_revisions end - -if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 1 - ActiveSupport::Reloader.to_prepare do - prepare - end -else - ActionDispatch::Reloader.to_prepare do - prepare - end -end diff --git a/test/ci/redmine_install.sh b/test/ci/redmine_install.sh index e945f50e..ee07a483 100644 --- a/test/ci/redmine_install.sh +++ b/test/ci/redmine_install.sh @@ -26,7 +26,7 @@ export PATH_TO_PLUGINS=./plugins export GENERATE_SECRET=generate_secret_token export MIGRATE_PLUGINS=redmine:plugins:migrate export REDMINE_GIT_REPO=git://github.com/redmine/redmine.git -export REDMINE_GIT_TAG=master +export REDMINE_GIT_TAG=3.4-stable export BUNDLE_GEMFILE=$PATH_TO_REDMINE/Gemfile clone_redmine()