Merge branch 'release/v2.6.2'

masciugo · Nov 4, 2019 · 6bcb634 · 6bcb634
2 parents fcc53a1 + a7b3ad4
commit 6bcb634
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,9 @@ matrix:
   allow_failures:
     - rvm: 2.5.1
       gemfile: gemfiles/rails_4.gemfile
+services:
+  - mysql
+  - postgresql
 
 before_script:
   - mysql -e 'create database genealogy_test;'

diff --git a/lib/genealogy/version.rb b/lib/genealogy/version.rb
@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end
diff --git a/spec/database.yml b/spec/database.yml
@@ -18,7 +18,7 @@ mysql:
   adapter: mysql2
   encoding: utf8
   database: genealogy_test
-  username: root
+  username: travis
 
 postgres:
   adapter: postgresql