Skip to content

Commit

Permalink
Update mysql gem
Browse files Browse the repository at this point in the history
  • Loading branch information
stravid committed Feb 14, 2013
1 parent 343eecc commit bea9e1c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'http://rubygems.org'

gem 'rails', '3.1.11'

gem "will_paginate", "~> 3.0.pre2"
gem "will_paginate", "~> 3.0"
gem 'jammit'
gem 'capistrano'

Expand All @@ -17,5 +17,5 @@ group :development, :test do
end

group :production do
gem 'mysql2'
gem 'mysql2', '~> 0.3'
end
11 changes: 6 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ GEM
treetop (~> 1.4.8)
mime-types (1.21)
multi_json (1.6.0)
mysql2 (0.2.6)
mysql2 (0.2.6-x86-mingw32)
mysql2 (0.3.11)
mysql2 (0.3.11-x86-mingw32)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
Expand All @@ -68,6 +68,7 @@ GEM
net-ssh (>= 1.99.1)
open4 (1.3.0)
pg (0.14.1)
pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
rack (1.3.10)
rack-cache (1.2)
Expand Down Expand Up @@ -107,7 +108,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
will_paginate (3.0.pre2)
will_paginate (3.0.3)
yui-compressor (0.9.6)
POpen4 (>= 0.1.4)

Expand All @@ -120,8 +121,8 @@ DEPENDENCIES
faker
jammit
machinist
mysql2
mysql2 (~> 0.3)
pg
rails (= 3.1.11)
shoulda
will_paginate (~> 3.0.pre2)
will_paginate (~> 3.0)

0 comments on commit bea9e1c

Please sign in to comment.