From e3fa861dfd3cec1a847e37d89f31e7c0721fb553 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 4 Nov 2013 14:23:38 +0100
Subject: [PATCH] 
 https://github.com/marutosi/chili/commit/209ed25f245726d4b2aba41c14a15c33cc710ec9

---
 test/ci/redmine_install.sh |  5 ++++-
 travis_patch.diff          | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 travis_patch.diff

diff --git a/test/ci/redmine_install.sh b/test/ci/redmine_install.sh
index 457776c2..cde282c1 100644
--- a/test/ci/redmine_install.sh
+++ b/test/ci/redmine_install.sh
@@ -35,7 +35,7 @@ clone_redmine()
   rm -rf $PATH_TO_REDMINE
   git clone -b $REDMINE_GIT_TAG --depth=100 --quiet $REDMINE_GIT_REPO $PATH_TO_REDMINE
   cd $PATH_TO_REDMINE
-  git checkout $REDMINE_GIT_TAG
+  git checkout $REDMINE_GIT_TAG  
 }
 
 run_tests()
@@ -88,6 +88,9 @@ run_install()
   #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
+
   # run redmine database migrations
   bundle exec rake db:migrate RAILS_ENV=test --trace
   bundle exec rake db:migrate RAILS_ENV=development --trace
diff --git a/travis_patch.diff b/travis_patch.diff
new file mode 100644
index 00000000..cae10401
--- /dev/null
+++ b/travis_patch.diff
@@ -0,0 +1,18 @@
+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)
+@@ -2,11 +2,11 @@
+   def self.up
+     Role.reset_column_information
+     nonmember = Role.new(:name => 'Non member', :position => 0)
+-    nonmember.builtin = Role::BUILTIN_NON_MEMBER
++    nonmember.send(:attributes=, { :builtin => Role::BUILTIN_NON_MEMBER }, false)
+     nonmember.save
+ 
+     anonymous = Role.new(:name => 'Anonymous', :position => 0)
+-    anonymous.builtin = Role::BUILTIN_ANONYMOUS
++    anonymous.send(:attributes=, { :builtin => Role::BUILTIN_ANONYMOUS }, false)
+     anonymous.save
+   end
+