Permalink
Browse files

Merge pull request #59 from echen/update_gems

Update gems
  • Loading branch information...
2 parents 733db0a + f46b83d commit 8d07e101ffab5e90c3e2b3eae42b583883f0be0d @echen echen committed Nov 10, 2012
Showing with 49 additions and 59 deletions.
  1. +49 −59 Gemfile.lock
View
@@ -30,78 +30,76 @@ GEM
multi_json (~> 1.0)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bootstrap-will_paginate (0.0.7)
+ bootstrap-will_paginate (0.0.9)
will_paginate
- builder (3.0.0)
- coderay (1.0.6)
+ builder (3.0.4)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
commonjs (0.2.6)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (3.0.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (2.0.0)
+ factory_girl (~> 3.0.0)
railties (>= 3.0.0)
- faraday (0.8.1)
+ faraday (0.8.4)
multipart-post (~> 1.1)
- haml (3.1.6)
- haml-rails (0.3.4)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- haml (~> 3.0)
- railties (~> 3.0)
- highline (1.6.13)
+ haml (3.1.7)
+ haml-rails (0.3.5)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (~> 3.1)
+ railties (>= 3.1, < 4.1)
+ highline (1.6.15)
hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
+ i18n (0.6.1)
+ journey (1.0.4)
+ jquery-rails (2.1.3)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json (1.7.3)
+ json (1.7.5)
kgio (2.7.4)
- less (2.2.1)
+ less (2.2.2)
commonjs (~> 0.2.6)
- less-rails (2.2.3)
+ less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.3.10.4)
- macaddr (1.6.1)
- systemu (~> 2.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- method_source (0.7.1)
- mime-types (1.18)
- mocha (0.11.4)
+ method_source (0.8.1)
+ mime-types (1.19)
+ mocha (0.12.7)
metaclass (~> 0.0.1)
- multi_json (1.3.6)
+ multi_json (1.3.7)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-ldap (0.3.1)
- nokogiri (1.5.3)
+ nokogiri (1.5.5)
polyglot (0.3.3)
- pry (0.9.9.3)
+ pry (0.9.10)
coderay (~> 1.0.5)
- method_source (~> 0.7.1)
- slop (>= 2.4.4, < 3)
+ method_source (~> 0.8)
+ slop (~> 3.3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.1)
actionmailer (= 3.2.1)
@@ -118,62 +116,54 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- raindrops (0.9.0)
+ raindrops (0.10.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- redis (3.0.1)
- redis-namespace (1.2.0)
+ redis (3.0.2)
+ redis-namespace (1.2.1)
redis (~> 3.0.0)
- redisk (0.2.2)
- redis (>= 0.1.1)
- redis-namespace (>= 0.1.0)
- resque (1.21.0)
+ resque (1.23.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- resque-status (0.3.3)
- redisk (>= 0.2.1)
+ resque-status (0.4.0)
resque (~> 1.19)
- uuid (~> 2.3)
- ruby-aws (1.5.0)
+ ruby-aws (1.6.0)
highline (>= 1.2.7)
nokogiri (>= 1.4)
- ruby-prof (0.10.8)
- simple_oauth (0.1.8)
- sinatra (1.3.2)
+ ruby-prof (0.11.2)
+ simple_oauth (0.1.9)
+ sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- slop (2.4.4)
+ slop (3.3.3)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
- systemu (2.5.2)
- therubyracer (0.10.1)
+ therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter (2.5.0)
+ twitter (4.2.0)
faraday (~> 0.8)
multi_json (~> 1.3)
simple_oauth (~> 0.1.6)
- tzinfo (0.3.33)
- uglifier (1.2.4)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- unicorn (4.3.1)
+ multi_json (~> 1.0, >= 1.0.2)
+ unicorn (4.4.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- uuid (2.3.5)
- macaddr (~> 1.0)
uuidtools (2.1.3)
vegas (0.1.11)
rack (>= 1.0.0)

0 comments on commit 8d07e10

Please sign in to comment.