diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
| commit | 384dbfd1408721ded071a587b0dc9ee40203607e (patch) | |
| tree | 770854b984691dea8187ca0a998a28e93a008093 /Gemfile | |
| parent | 900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff) | |
| parent | af1b48926f49226c934995c322ee017239158cf3 (diff) | |
| download | rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2 rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -14,6 +14,7 @@ gem "rack-test", :git => "git://github.com/brynary/rack-test.git" gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git" gem "coffee-script" gem "sass", ">= 3.0" +gem "uglifier" gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" @@ -26,7 +27,6 @@ end # AS gem "memcache-client", ">= 1.8.5" -gem "fssm", "~> 0.2.5" platforms :mri_18 do gem "system_timer" @@ -52,7 +52,7 @@ platforms :ruby do gem "sqlite3", "~> 1.3.3" group :db do - gem "pg", ">= 0.9.0" + gem "pg", ">= 0.11.0" gem "mysql", ">= 2.8.1" gem "mysql2", :git => "git://github.com/brianmario/mysql2.git" end |