mirror of https://github.com/rails/rails
Don't use mysql2 0.4 in our tests.
This commit is contained in:
parent
55084747ec
commit
233091c0ec
2
Gemfile
2
Gemfile
|
@ -69,7 +69,7 @@ platforms :ruby do
|
|||
group :db do
|
||||
gem 'pg', '>= 0.11.0'
|
||||
gem 'mysql', '>= 2.9.0'
|
||||
gem 'mysql2', '>= 0.3.13'
|
||||
gem 'mysql2', '>= 0.3.13', '< 0.4'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
24
Gemfile.lock
24
Gemfile.lock
|
@ -48,7 +48,7 @@ GEM
|
|||
specs:
|
||||
arel (5.0.1.20140414130214)
|
||||
bcrypt (3.1.10)
|
||||
benchmark-ips (2.2.0)
|
||||
benchmark-ips (2.3.0)
|
||||
builder (3.2.2)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
@ -59,9 +59,9 @@ GEM
|
|||
coffee-script-source (1.9.1.1)
|
||||
dalli (2.7.4)
|
||||
erubis (2.7.0)
|
||||
execjs (2.5.2)
|
||||
execjs (2.6.0)
|
||||
i18n (0.7.0)
|
||||
jquery-rails (3.1.3)
|
||||
jquery-rails (3.1.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.3)
|
||||
|
@ -71,7 +71,7 @@ GEM
|
|||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
metaclass (0.0.4)
|
||||
mime-types (2.6.1)
|
||||
mime-types (2.6.2)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.3.3)
|
||||
mocha (0.14.0)
|
||||
|
@ -81,10 +81,10 @@ GEM
|
|||
mysql2 (0.3.18)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
pg (0.18.2)
|
||||
racc (1.4.12)
|
||||
pg (0.18.3)
|
||||
racc (1.4.13)
|
||||
rack (1.5.5)
|
||||
rack-cache (1.2)
|
||||
rack-cache (1.5.1)
|
||||
rack (>= 0.4)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
|
@ -97,11 +97,11 @@ GEM
|
|||
rdoc (~> 4.0)
|
||||
sprockets (3.0.3)
|
||||
rack (~> 1.0)
|
||||
sprockets-rails (2.3.2)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sqlite3 (1.3.10)
|
||||
sqlite3 (1.3.11)
|
||||
stackprof (0.2.7)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
|
@ -109,7 +109,7 @@ GEM
|
|||
coffee-rails
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.1)
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
w3c_validators (1.2)
|
||||
|
@ -134,7 +134,7 @@ DEPENDENCIES
|
|||
mocha (~> 0.14)
|
||||
mustache (~> 0.99.8)
|
||||
mysql (>= 2.9.0)
|
||||
mysql2 (>= 0.3.13)
|
||||
mysql2 (>= 0.3.13, < 0.4)
|
||||
nokogiri (>= 1.4.5)
|
||||
pg (>= 0.11.0)
|
||||
racc (>= 1.4.6)
|
||||
|
@ -151,4 +151,4 @@ DEPENDENCIES
|
|||
w3c_validators
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.5
|
||||
1.10.6
|
||||
|
|
Loading…
Reference in New Issue