Gemfile.lock in refinerycms-admin-locales-2.0.0 vs Gemfile.lock in refinerycms-admin-locales-2.1.0.dev

- old
+ new

@@ -1,10 +1,81 @@ +GIT + remote: git://github.com/parndt/refinerycms-i18n.git + revision: 2a6d35554421d4e0a2ebeba6eb291bcd0ade9291 + specs: + refinerycms-i18n (2.1.0.dev) + rails-i18n (~> 0.6.5) + refinerycms-core (~> 2.0) + routing-filter (~> 0.3.0) + +GIT + remote: git://github.com/parndt/refinerycms-settings.git + revision: 37e592a43dcd2ed24a11f678cd1e3fc76fa9cf75 + specs: + refinerycms-settings (2.1.0.dev) + acts_as_indexed (~> 0.7.7) + refinerycms-core (~> 2.1.0.dev) + +GIT + remote: git://github.com/resolve/refinerycms.git + revision: 70516f2c64b917bb2fde7dff1aaf53fdc236f139 + specs: + refinerycms (2.1.0.dev) + bundler (~> 1.0) + refinerycms-authentication (= 2.1.0.dev) + refinerycms-core (= 2.1.0.dev) + refinerycms-dashboard (= 2.1.0.dev) + refinerycms-images (= 2.1.0.dev) + refinerycms-pages (= 2.1.0.dev) + refinerycms-resources (= 2.1.0.dev) + refinerycms-authentication (2.1.0.dev) + actionmailer (>= 3.1.3, < 3.3) + devise (~> 2.0.0) + orm_adapter (~> 0.0.7) + refinerycms-core (= 2.1.0.dev) + refinerycms-core (2.1.0.dev) + actionpack (>= 3.1.3, < 3.3) + activerecord (>= 3.1.3, < 3.3) + awesome_nested_set (~> 2.1.3) + coffee-rails (~> 3.2.1) + jquery-rails (~> 2.0.0) + railties (>= 3.1.3, < 3.3) + sass-rails (~> 3.2.3) + truncate_html (~> 0.5) + will_paginate (~> 3.0.2) + refinerycms-dashboard (2.1.0.dev) + refinerycms-core (= 2.1.0.dev) + refinerycms-images (2.1.0.dev) + acts_as_indexed (~> 0.7.7) + dragonfly (~> 0.9.8) + rack-cache (>= 0.5.3) + refinerycms-core (= 2.1.0.dev) + refinerycms-pages (2.1.0.dev) + acts_as_indexed (~> 0.7.7) + awesome_nested_set (~> 2.1.3) + babosa (!= 0.3.6) + friendly_id (~> 4.0.4) + globalize3 (~> 0.2.0) + refinerycms-core (= 2.1.0.dev) + seo_meta (~> 1.3.0) + refinerycms-resources (2.1.0.dev) + acts_as_indexed (~> 0.7.7) + dragonfly (~> 0.9.8) + rack-cache (>= 0.5.3) + refinerycms-core (= 2.1.0.dev) + refinerycms-testing (2.1.0.dev) + capybara (~> 1.1.2) + database_cleaner (~> 0.7.2) + factory_girl_rails (~> 1.7.0) + refinerycms-core (= 2.1.0.dev) + rspec-rails (~> 2.11) + PATH remote: . specs: refinerycms-admin-locales (2.1.0.dev) - refinerycms-core (~> 2.0.0) + refinerycms-core (~> 2.1.0.dev) GEM remote: https://rubygems.org/ specs: actionmailer (3.2.8) @@ -26,59 +97,56 @@ activerecord (3.2.8) activemodel (= 3.2.8) activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) acts_as_indexed (0.7.8) + addressable (2.3.2) arel (3.0.2) - awesome_nested_set (2.1.6) + awesome_nested_set (2.1.3) activerecord (>= 3.0.0) - babosa (0.3.10) + babosa (0.3.8) bcrypt-ruby (3.0.1) builder (3.0.0) - capybara (1.1.4) + capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.9) - ffi (~> 1.0, >= 1.0.11) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) 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) database_cleaner (0.7.2) - devise (2.0.5) + devise (2.0.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) warden (~> 1.1.1) - diff-lcs (1.2.4) - dragonfly (0.9.15) - multi_json (~> 1.0) + diff-lcs (1.1.3) + dragonfly (0.9.12) rack erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) - ffi (1.8.1) - friendly_id (4.0.9) + ffi (1.1.5) + friendly_id (4.0.8) globalize3 (0.2.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) paper_trail (~> 2) hike (1.2.1) @@ -86,164 +154,103 @@ journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.7.4) - libv8 (3.11.8.13) + libwebsocket (0.1.5) + addressable mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) + mime-types (1.19) multi_json (1.3.6) mysql2 (0.3.11) - nokogiri (1.5.9) + nokogiri (1.5.5) orm_adapter (0.0.7) - paper_trail (2.7.2) + paper_trail (2.6.3) activerecord (~> 3.0) railties (~> 3.0) - pg (0.15.1) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack rack-test (0.6.1) 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) - bundler (~> 1.0) - railties (= 3.2.8) + rails-i18n (0.6.5) + i18n (~> 0.5) railties (3.2.8) actionpack (= 3.2.8) activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - ref (1.0.2) - refinerycms (2.0.9) - bundler (~> 1.0) - refinerycms-authentication (= 2.0.9) - refinerycms-core (= 2.0.9) - refinerycms-dashboard (= 2.0.9) - refinerycms-images (= 2.0.9) - refinerycms-pages (= 2.0.9) - refinerycms-resources (= 2.0.9) - refinerycms-authentication (2.0.9) - devise (~> 2.0.0) - orm_adapter (~> 0.0.7) - refinerycms-core (= 2.0.9) - refinerycms-core (2.0.9) - acts_as_indexed (~> 0.7.7) - awesome_nested_set (~> 2.1.3) - coffee-rails (~> 3.2.1) - friendly_id (~> 4.0.1) - globalize3 (~> 0.2.0) - jquery-rails (~> 2.0.0) - rails (>= 3.1.3, < 3.3) - sass-rails (~> 3.2.3) - truncate_html (~> 0.5) - uglifier (>= 1.0.3) - will_paginate (~> 3.0.2) - refinerycms-dashboard (2.0.9) - refinerycms-core (= 2.0.9) - refinerycms-i18n (2.0.2) - refinerycms-core (~> 2.0.0) - routing-filter (>= 0.2.3) - refinerycms-images (2.0.9) - dragonfly (~> 0.9.8) - rack-cache (>= 0.5.3) - refinerycms-core (= 2.0.9) - refinerycms-pages (2.0.9) - awesome_nested_set (~> 2.1.3) - babosa (!= 0.3.6) - refinerycms-core (= 2.0.9) - seo_meta (~> 1.3.0) - refinerycms-resources (2.0.9) - dragonfly (~> 0.9.8) - rack-cache (>= 0.5.3) - refinerycms-core (= 2.0.9) - refinerycms-settings (2.0.2) - refinerycms-core (~> 2.0.1) - refinerycms-testing (2.0.9) - capybara (~> 1.1.2) - database_cleaner (~> 0.7.2) - factory_girl_rails (~> 1.7.0) - refinerycms-core (= 2.0.9) - rspec-rails (~> 2.11) routing-filter (0.3.1) actionpack - rspec-core (2.13.1) - rspec-expectations (2.13.0) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.13.1) - rspec-rails (2.13.2) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.2) + rspec-rails (2.11.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) + rspec (~> 2.11.0) rubyzip (0.9.9) sass (3.2.0) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.33.0) + selenium-webdriver (2.25.0) childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - websocket (~> 1.0.4) seo_meta (1.3.0) railties (>= 3.0.0) sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) - therubyracer (0.11.2) - libv8 (~> 3.11.8.12) - ref thor (0.15.4) tilt (1.3.3) - treetop (1.4.12) + treetop (1.4.10) polyglot polyglot (>= 0.3.1) - truncate_html (0.9.2) - tzinfo (0.3.37) + truncate_html (0.5.5) + tzinfo (0.3.33) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) warden (1.1.1) rack (>= 1.0) - websocket (1.0.7) - will_paginate (3.0.4) + will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES coffee-rails jquery-rails mysql2 - pg - refinerycms (~> 2.0.0) + refinerycms! refinerycms-admin-locales! - refinerycms-i18n (~> 2.0.0) - refinerycms-settings (~> 2.0.0) - refinerycms-testing (~> 2.0.1) + refinerycms-i18n! + refinerycms-settings! + refinerycms-testing! sass-rails sqlite3 - therubyracer uglifier