diff --git a/Gemfile.lock b/Gemfile.lock index cba9cce..b0e1190 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,9 +6,9 @@ GIT GIT remote: https://github.com/activescaffold/active_scaffold.git - revision: 75abf52219da6015e76a9bd9115f80134a384d69 + revision: c2380071424210e6704fc278c677ae340caf8311 specs: - active_scaffold (3.1.11) + active_scaffold (3.1.13) rails (~> 3.1.0) GEM @@ -62,7 +62,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.2.3) + childprocess (0.2.4) ffi (~> 1.0.6) chunky_png (1.2.5) coffee-rails (3.1.1) @@ -71,13 +71,13 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) - compass (0.12.alpha.2) + coffee-script-source (1.2.0) + compass (0.12.alpha.3) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) daemons (1.0.10) - dalli (1.1.3) + dalli (1.1.4) database_cleaner (0.6.7) devise (1.4.9) bcrypt-ruby (~> 3.0) @@ -85,7 +85,7 @@ GEM warden (~> 1.0.3) diff-lcs (1.1.3) erubis (2.7.0) - execjs (1.2.9) + execjs (1.2.13) multi_json (~> 1.0) factory_girl (2.3.2) activesupport @@ -97,20 +97,21 @@ GEM ffi (1.0.11) fssm (0.2.7) gem_plugin (0.2.3) - guard (0.8.8) + guard (0.10.0) + ffi (>= 0.5.0) thor (~> 0.14.6) guard-rspec (0.4.5) guard (>= 0.4.0) guard-spork (0.3.2) guard (>= 0.8.4) spork (>= 0.8.4) - highline (1.6.8) + highline (1.6.9) hike (1.2.1) i18n (0.6.0) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - json (1.6.2) + json (1.6.4) libnotify (0.5.9) libv8 (3.3.10.4) mail (2.3.0) @@ -123,7 +124,7 @@ GEM daemons (~> 1.0.10) gem_plugin (~> 0.2.3) multi_json (1.0.4) - mysql2 (0.3.10) + mysql2 (0.3.11) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -139,7 +140,7 @@ GEM pjax_rails (0.1.10) jquery-rails polyglot (0.3.3) - rack (1.3.5) + rack (1.3.6) rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) @@ -169,7 +170,7 @@ GEM rb-fsevent (0.4.3.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.11) + rdoc (3.12) json (~> 1.4) rspec (2.6.0) rspec-core (~> 2.6.0) @@ -185,13 +186,13 @@ GEM railties (~> 3.0) rspec (~> 2.6.0) rubyzip (0.9.5) - sass (3.1.11) + sass (3.1.12) sass-rails (3.1.5) actionpack (~> 3.1.0) railties (~> 3.1.0) sass (~> 3.1.10) tilt (~> 1.3.2) - selenium-webdriver (2.14.0) + selenium-webdriver (2.15.0) childprocess (>= 0.2.1) ffi (~> 1.0.9) multi_json (~> 1.0.4) @@ -210,7 +211,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.31) - uglifier (1.1.0) + uglifier (1.2.1) execjs (>= 0.3.0) multi_json (>= 1.0.2) warden (1.0.6)