Update Gemfile

kei-s · Dec 25, 2012 · e28d3a9 · e28d3a9
1 parent 80bdfa1
commit e28d3a9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'haml'
 gem 'github-markup'
 gem 'redcarpet'
 gem 'RedCloth'
-gem 'rdoc', '3.6.1'
+gem 'rdoc'
 gem 'org-ruby'
 gem 'creole'
 gem 'wikicloth'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     RedCloth (4.2.9)
     addressable (2.3.2)
     builder (3.1.4)
-    capybara (2.0.0)
+    capybara (2.0.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -19,48 +19,51 @@ GEM
     eventmachine (1.0.0)
     excon (0.16.10)
     expression_parser (0.9.0)
-    ffi (1.1.5)
-    github-markup (0.7.4)
+    ffi (1.2.0)
+    github-markup (0.7.5)
     haml (3.1.7)
-    heroku (2.33.1)
-      heroku-api (~> 0.3.6)
+    heroku (2.33.5)
+      heroku-api (~> 0.3.7)
       launchy (>= 0.3.2)
       netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.3.6)
-      excon (~> 0.16.7)
+    heroku-api (0.3.7)
+      excon (~> 0.16.10)
+    json (1.7.5)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.6)
+    libwebsocket (0.1.7.1)
+      addressable
       websocket
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     netrc (0.7.7)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     org-ruby (0.7.2)
       rubypants (>= 0.2.0)
     rack (1.4.1)
-    rack-protection (1.2.0)
+    rack-protection (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.1)
-    rdoc (3.6.1)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
     redcarpet (2.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     rubypants (0.2.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
@@ -74,7 +77,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    websocket (1.0.3)
+    websocket (1.0.6)
     wikicloth (0.8.0)
       builder
       expression_parser
@@ -93,7 +96,7 @@ DEPENDENCIES
   heroku
   org-ruby
   rake
-  rdoc (= 3.6.1)
+  rdoc
   redcarpet
   rspec
   sinatra