Gemfile.lock in fullstack-admin-0.2.12 vs Gemfile.lock in fullstack-admin-0.2.13

- old
+ new

@@ -1,98 +1,94 @@ -GIT - remote: git://github.com/kristianmandrup/formtastic-bootstrap.git - revision: 0098b96e8517f652d1de2b9299ef1f0719bde025 - specs: - formtastic-bootstrap (2.2.1) - formtastic (~> 2.2.1) - rails (>= 3.2.0) - -GIT - remote: git://github.com/paranoida/ckeditor.git - revision: 37614dbf14c20f7cf555a35cdf8e13dd9803bc40 - specs: - ckeditor (3.7.1) - mime-types - orm_adapter - GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) + sprockets (~> 2.2.1) active_record_schema (0.5.13) rails - activemodel (3.2.8) - activesupport (= 3.2.8) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) auto_strip_attributes (2.0.2) activerecord (>= 3.0) - aws-sdk (1.6.6) + aws-sdk (1.8.0) httparty (~> 0.7) json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) bcrypt-ruby (3.0.1) - bootstrap-datepicker-rails (0.6.16) + bootstrap-datepicker-rails (0.6.35) railties (>= 3.0) bootstrap-helpers (0.1.8) rails - builder (3.0.0) - chosen-rails (0.9.8.1) - railties (~> 3.0) - thor (~> 0.14) - cocaine (0.3.1) + builder (3.0.4) + checkin (0.5.1) + chosen-rails (0.9.11.1) + coffee-rails (>= 3.2) + railties (>= 3.0) + sass-rails (>= 3.2) + ckeditor (3.7.3) + mime-types + orm_adapter + cocaine (0.4.2) + 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) coffeebeans (1.0.1) actionpack (>= 3.0.0) coffee-script - devise (2.1.2) + devise (2.2.0) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - devise-i18n (0.5.7) - devise-i18n-views (0.2.2) + devise-i18n (0.5.12) + devise-i18n-views (0.2.5) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - facebox-rails (0.1.2) - railties (~> 3.0) - thor (~> 0.14) + facebox-rails (0.2.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) flash_cookie_session (1.1.3) rails (~> 3.0) formtastic (2.2.1) actionpack (>= 3.0) + formtastic-bootstrap (2.0.0) + formtastic (~> 2.2) + formtastic-bootstrap fullstack (0.1.26) active_record_schema auto_strip_attributes + checkin coffeebeans devise devise-i18n devise-i18n-views flash_cookie_session @@ -125,21 +121,21 @@ hike (1.2.1) htmlentities (4.3.1) httparty (0.9.0) multi_json (~> 1.0) multi_xml - i18n (0.6.0) + i18n (0.6.1) jeweler (1.8.4) bundler (~> 1.0) git (>= 1.2.5) rake rdoc journey (1.0.4) - jquery-rails (2.1.2) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.6) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) kaminari-i18n (0.1.3) @@ -154,86 +150,92 @@ actionpack (~> 3.1) activerecord (~> 3.1) activesupport (~> 3.1) polyamorous (~> 0.5.0) mime-types (1.19) - mobile-fu (1.1.0) + mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.3.6) + multi_json (1.5.0) multi_xml (0.5.1) - net-ssh (2.5.2) - nokogiri (1.5.5) + net-ssh (2.6.2) + nokogiri (1.5.6) orm_adapter (0.4.0) - paperclip (3.2.0) + paperclip (3.4.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) - cocaine (>= 0.0.2) + cocaine (~> 0.4.0) mime-types plupload-rails (1.0.6) rails (~> 3.1) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-mobile-detect (0.4.0) rack rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.8) - rails-i18n (0.6.6) + railties (= 3.2.11) + rails-i18n (0.7.2) i18n (~> 0.5) rails-slow-assets-workaround (0.1.1) rails - rails_config (0.3.1) + rails_config (0.3.2) activesupport (>= 3.0) rails_nested_layouts (0.1.1) rails - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) + rake (10.0.3) rambler (0.1.3) rails (~> 3.2) rdoc (3.12) json (~> 1.4) remoting (0.3.9) net-ssh rails (~> 3.0) remotipart (1.0.2) resource-presentation-helpers (0.1.1) rails - sprockets (2.1.3) + sass (3.2.5) + sass-rails (3.2.5) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - squeel (1.0.11) + squeel (1.0.14) activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) - thor (0.15.4) + thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.35) uuidtools (2.1.3) warden (1.2.1) rack (>= 1.0) PLATFORMS @@ -241,12 +243,12 @@ DEPENDENCIES bootstrap-datepicker-rails bootstrap-helpers (~> 0.1.7) chosen-rails - ckeditor! + ckeditor facebox-rails - formtastic-bootstrap! + formtastic-bootstrap fullstack (~> 0.1.26) has-attached (~> 0.2.4) jeweler meta_search plupload-rails