Bundle update (CVE-2018-3760, requires Ruby 2.3, PR #561)

foodcoops · Oct 13, 2018 · d9ae0d1 · d9ae0d1
1 parent 4137992
commit d9ae0d1
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 122 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 sudo: false
 rvm:
- - 2.1
+ - 2.3
 services:
  - mysql
  - redis-server

diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,7 @@ gem 'rails-assets-listjs', '0.2.0.beta.4' # remember to maintain list.*.js plugi
 gem 'i18n-js', '~> 3.0.0.rc8'
 gem 'rails-i18n'
 
-gem 'mysql2'
+gem 'mysql2', '~> 0.4.0' # for compatibility with rails 4
 gem 'prawn'
 gem 'prawn-table'
 gem 'haml', '~> 4.0' # some breaking changes in version 5, remove this line again when fixed