gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1694 from Ana06/fix-sql2

Browse source 
Update mariadb to 10.2 to solve Travis failures
This commit is contained in:
Henne Vogelsang 2017-09-12 15:29:43 +02:00 • committed by GitHub
commit cb20dca10a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -8,7 +8,7 @@ before_install:
- "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
- "echo `phantomjs -v`" - "echo `phantomjs -v`"
addons: addons:
mariadb: '10.1' mariadb: '10.2'
notifications: notifications:
email: email:
on_success: change on_success: change

2
Gemfile.lock
View file

@ -287,7 +287,7 @@ GEM
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.2) mysql2 (0.4.9)
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.8.0) nokogiri (1.8.0)