diff --git a/test/ci/redmine_install.sh b/test/ci/redmine_install.sh index cde282c1..71e36d51 100644 --- a/test/ci/redmine_install.sh +++ b/test/ci/redmine_install.sh @@ -86,10 +86,7 @@ run_install() #Not ideal, but at present Travis-CI will not install with xapian enabled. #02-04-2013 bundle install needs to happen AFTER database configuration - bundle install --path vendor/bundle --without xapian - - # https://github.com/marutosi/chili/commit/209ed25f245726d4b2aba41c14a15c33cc710ec9 - patch -p0 < $PATH_TO_DMSF/travis_patch.diff + bundle install --path vendor/bundle --without xapian # run redmine database migrations bundle exec rake db:migrate RAILS_ENV=test --trace diff --git a/travis_patch.diff b/travis_patch.diff deleted file mode 100644 index c1e8930a..00000000 --- a/travis_patch.diff +++ /dev/null @@ -1,21 +0,0 @@ -Index: db/migrate/062_insert_builtin_roles.rb -=================================================================== ---- db/migrate/062_insert_builtin_roles.rb (revision 12244) -+++ db/migrate/062_insert_builtin_roles.rb (working copy) -@@ -1,16 +0,0 @@ --class InsertBuiltinRoles < ActiveRecord::Migration -- def self.up -- Role.reset_column_information -- nonmember = Role.new(:name => 'Non member', :position => 0) -- nonmember.builtin = Role::BUILTIN_NON_MEMBER -- nonmember.save -- -- anonymous = Role.new(:name => 'Anonymous', :position => 0) -- anonymous.builtin = Role::BUILTIN_ANONYMOUS -- anonymous.save -- end -- -- def self.down -- Role.destroy_all 'builtin <> 0' -- end --end