diff --git a/Gemfile.lock b/Gemfile.lock index e4b3cb8..d31ac36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,7 @@ GEM coffee-script-source execjs coffee-script-source (1.1.2) + concurrent-ruby (1.1.10) daemon_controller (0.2.6) erubis (2.7.0) execjs (1.2.9) @@ -56,7 +57,8 @@ GEM fastthread (1.0.7) highline (1.6.8) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-rails (1.0.14) railties (~> 3.0) thor (~> 0.14) @@ -67,8 +69,6 @@ GEM treetop (~> 1.4.8) mime-types (1.16) multi_json (1.0.3) - 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) @@ -86,6 +86,8 @@ GEM fastthread (>= 1.0.1) rack rake (>= 0.8.1) + pg (1.3.5) + pg (1.3.5-x86-mingw32) polyglot (0.3.2) rack (1.3.3) rack-cache (1.0.3) @@ -149,9 +151,9 @@ DEPENDENCIES capistrano coffee-rails (~> 3.1.0) jquery-rails - mysql2 paperclip passenger + pg rails (= 3.1.0) sass-rails (~> 3.1.0) sqlite3