Gemfile.lock in fullstack-admin-0.1.39 vs Gemfile.lock in fullstack-admin-0.1.40

- old
+ new

@@ -1,5 +1,21 @@ +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) @@ -12,12 +28,12 @@ journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - active_record_schema (0.5.2) - rails (~> 3.0) + active_record_schema (0.5.12) + rails activemodel (3.2.8) activesupport (= 3.2.8) builder (~> 3.0.0) activerecord (3.2.8) activemodel (= 3.2.8) @@ -39,17 +55,14 @@ bootstrap-helpers (0.1.1) rails bootstrap-wysihtml5-rails (0.3.0) railties (>= 3.0) builder (3.0.0) - checkin (0.5.0) + checkin (0.5.1) chosen-rails (0.9.8.1) railties (~> 3.0) thor (~> 0.14) - ckeditor (3.7.1) - mime-types - orm_adapter coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.3.3) coffeebeans (1.0.1) @@ -59,26 +72,23 @@ devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - devise-i18n (0.5.3) + devise-i18n (0.5.4) devise-i18n-views (0.2.2) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) facebox-rails (0.1.2) railties (~> 3.0) thor (~> 0.14) flash_cookie_session (1.1.3) rails (~> 3.0) - formtastic (2.1.1) - actionpack (~> 3.0) - formtastic-bootstrap (1.1.1) - formtastic - rails (~> 3.1) - fullstack (0.1.10) + formtastic (2.2.1) + actionpack (>= 3.0) + fullstack (0.1.25) active_record_schema auto_strip_attributes checkin coffeebeans devise @@ -99,10 +109,11 @@ rails_config rails_nested_layouts rambler remoting remotipart + resource-presentation-helpers squeel git (1.2.5) has_partial (0.1.1) rails hike (1.2.1) @@ -112,12 +123,12 @@ bundler (~> 1.0) git (>= 1.2.5) rake rdoc journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + jquery-rails (2.1.1) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.4) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -187,18 +198,20 @@ rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) - rambler (0.1.2) + 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 select2-rails (3.0.0) thor (~> 0.14) sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) @@ -224,14 +237,13 @@ DEPENDENCIES bootstrap-datepicker-rails bootstrap-helpers bootstrap-wysihtml5-rails chosen-rails - ckeditor + ckeditor! facebox-rails - formtastic (= 2.1.1) - formtastic-bootstrap - fullstack + formtastic-bootstrap! + fullstack (~> 0.1.25) jeweler less-rails-bootstrap meta_search plupload-rails rails (~> 3.2)