Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-15 00:36:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1939 from TracksApp/support-mysql-5.7

Browse source 
Bump mysql2 to 0.3.20
This commit is contained in:
Matt Rogers 2015-11-27 15:21:12 -06:00
commit 9389fbef9a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -21,7 +21,7 @@ gem 'jquery-rails'
# always possible on all platforms # always possible on all platforms
# Alternatively use --without <group> arguments to bundler to not install that group # Alternatively use --without <group> arguments to bundler to not install that group
gem "sqlite3", group: :sqlite gem "sqlite3", group: :sqlite
gem "mysql2", group: :mysql gem "mysql2", "~> 0.3.17", group: :mysql
gem "RedCloth" gem "RedCloth"
gem "sanitize", ">=3.0.0" gem "sanitize", ">=3.0.0"

4
Gemfile.lock
View file

@ -118,7 +118,7 @@ GEM
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.11.1) multi_json (1.11.1)
multi_test (0.1.1) multi_test (0.1.1)
mysql2 (0.3.16) mysql2 (0.3.20)
nokogiri (1.6.4) nokogiri (1.6.4)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
nokogumbo (1.1.12) nokogumbo (1.1.12)
@ -245,7 +245,7 @@ DEPENDENCIES
htmlentities htmlentities
jquery-rails jquery-rails
mocha mocha
mysql2 mysql2 (~> 0.3.17)
paperclip paperclip
rack-dev-mark rack-dev-mark
rack-mini-profiler rack-mini-profiler