The Travis patch removed as non-functional
This commit is contained in:
parent
f82aa2d4b9
commit
f6dfdad92c
@ -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
|
||||
|
||||
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user