diff options
| -rw-r--r-- | Gemfile.lock | 102 |
1 files changed, 56 insertions, 46 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6095df3aa..ae595227b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,11 +40,11 @@ GIT GIT remote: git://github.com/thoughtbot/shoulda.git - revision: f75da7490e542d2da228b2dd74b3ca585f2bbdda + revision: 80545637b957fc68a3b7be8993033d089913ac66 specs: - shoulda (3.0.1) - shoulda-context (~> 1.0.0) - shoulda-matchers (~> 1.0.0) + shoulda (3.0.0.beta2) + shoulda-context (~> 1.0.0.beta1) + shoulda-matchers (~> 1.0.0.beta1) GIT remote: git://sim.dryade.priv/user_interface @@ -59,8 +59,9 @@ GEM GeoRuby (1.3.4) RedCloth (4.2.9) RedCloth (4.2.9-java) - SyslogLogger (1.4.1) - ZenTest (4.7.0) + SyslogLogger (1.4.0) + hoe (>= 1.2.0) + ZenTest (4.5.0) actionmailer (3.1.3) actionpack (= 3.1.3) mail (~> 2.3.0) @@ -89,18 +90,18 @@ GEM activesupport (= 3.1.3) activesupport (3.1.3) multi_json (~> 1.0) - addressable (2.2.7) + addressable (2.2.6) albino (1.3.3) posix-spawn (>= 0.3.6) arel (2.2.3) autotest-notification (2.3.4) autotest-standalone (~> 4.5) - autotest-rails (4.1.2) - ZenTest (~> 4.5) + autotest-rails (4.1.1) + ZenTest (= 4.5) autotest-standalone (4.5.9) bouncy-castle-java (1.5.0146.1) builder (3.0.0) - capistrano (2.11.2) + capistrano (2.9.0) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -115,7 +116,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.1) + childprocess (0.3.0) ffi (~> 1.0.6) classifier (1.3.3) fast-stemmer (>= 1.0.0) @@ -125,40 +126,40 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) + coffee-script-source (1.1.2) composite_primary_keys (4.1.2) activerecord (~> 3.1) - cucumber (1.1.9) + cucumber (1.1.4) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.9.0) + gherkin (~> 2.7.1) json (>= 1.4.6) term-ansicolor (>= 1.0.6) - cucumber-rails (1.3.0) + cucumber-rails (1.2.1) capybara (>= 1.1.2) - cucumber (>= 1.1.8) + cucumber (>= 1.1.3) nokogiri (>= 1.5.0) - database_cleaner (0.7.2) + database_cleaner (0.7.1) diff-lcs (1.1.3) directory_watcher (1.4.1) erubis (2.7.0) - execjs (1.3.0) + execjs (1.2.13) 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 (2.5.0) + activesupport + factory_girl_rails (1.6.0) + factory_girl (~> 2.5.0) railties (>= 3.0.0) fast-stemmer (1.0.0) ffi (1.0.11) ffi (1.0.11-java) - formtastic (2.1.1) - actionpack (~> 3.0) + formtastic (2.0.2) + rails (~> 3.0) geokit (1.6.5) multi_json - gherkin (2.9.1) + gherkin (2.7.6) json (>= 1.4.6) - gherkin (2.9.1-java) + gherkin (2.7.6-java) json (>= 1.4.6) guard (1.0.1) ffi (>= 0.5.0) @@ -168,23 +169,32 @@ GEM has_scope (0.5.1) highline (1.6.11) hike (1.2.1) + hoe (2.14.0) + rake (~> 0.8) i18n (0.6.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) + jekyll (0.11.2) + albino (~> 1.3) + classifier (~> 1.3) + directory_watcher (~> 1.1) + kramdown (~> 0.13) + liquid (~> 2.3) + maruku (~> 0.5) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - jruby-jars (1.6.7) - jruby-openssl (0.7.6.1) - bouncy-castle-java (>= 1.5.0146.1) - jruby-rack (1.1.4) + jruby-jars (1.6.5.1) + jruby-openssl (0.7.4) + bouncy-castle-java + jruby-rack (1.1.2) json (1.6.5) json (1.6.5-java) kramdown (0.13.5) - launchy (2.1.0) + launchy (2.0.5) addressable (~> 2.2.6) - launchy (2.1.0-java) + launchy (2.0.5-java) addressable (~> 2.2.6) ffi (~> 1.0.9) spoon (~> 0.0.1) @@ -197,7 +207,7 @@ GEM maruku (0.6.0) syntax (>= 1.0.0) mime-types (1.18) - multi_json (1.1.0) + multi_json (1.0.4) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -205,8 +215,8 @@ GEM net-ssh (2.3.0) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - nokogiri (1.5.2) - nokogiri (1.5.2-java) + nokogiri (1.5.0) + nokogiri (1.5.0-java) pg (0.11.0) polyamorous (0.5.0) activerecord (~> 3.0) @@ -266,18 +276,18 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.9.0) - rubyzip (0.9.6.1) - sass (3.1.15) - sass-rails (3.1.6) + rspec (~> 2.8.0) + rubyzip (0.9.5) + sass (3.1.12) + sass-rails (3.1.5) actionpack (~> 3.1.0) railties (~> 3.1.0) - sass (>= 3.1.10) + sass (~> 3.1.10) tilt (~> 1.3.2) - selenium-webdriver (2.20.0) + selenium-webdriver (2.17.0) childprocess (>= 0.2.5) - ffi (~> 1.0) - multi_json (~> 1.0) + ffi (~> 1.0.9) + multi_json (~> 1.0.4) rubyzip shoulda-context (1.0.0) shoulda-matchers (1.0.0) @@ -299,10 +309,10 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.32) - uglifier (1.2.3) + uglifier (1.2.1) execjs (>= 0.3.0) multi_json (>= 1.0.2) - warbler (1.3.4) + warbler (1.3.2) jruby-jars (>= 1.4.0) jruby-rack (>= 1.0.0) rake (>= 0.8.7) @@ -310,7 +320,7 @@ GEM will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) - yard (0.7.5) + yard (0.7.4) PLATFORMS java |