diff --git a/.gitignore b/.gitignore index 2b54990..b2c9314 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ tmp nbproject *.swp spec/dummy +Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 06714dc..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,209 +0,0 @@ -PATH - remote: . - specs: - spree_product_zoom (1.3) - spree_core (~> 2.1.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.0.3) - actionpack (= 4.0.3) - mail (~> 2.5.4) - actionpack (4.0.3) - activesupport (= 4.0.3) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - active_utils (2.0.1) - activesupport (>= 2.3.11) - i18n - activemerchant (1.42.5) - active_utils (~> 2.0, >= 2.0.1) - activesupport (>= 2.3.14, < 5.0.0) - builder (>= 2.1.2, < 4.0.0) - i18n (~> 0.5) - json (~> 1.7) - money (< 7.0.0) - nokogiri (~> 1.4) - activemodel (4.0.3) - activesupport (= 4.0.3) - builder (~> 3.1.0) - activerecord (4.0.3) - activemodel (= 4.0.3) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.3) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.3) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - acts_as_list (0.3.0) - activerecord (>= 3.0) - arel (4.0.2) - atomic (1.1.14) - awesome_nested_set (3.0.0.rc.3) - activerecord (>= 4.0.0, < 5) - aws-sdk (1.27.0) - json (~> 1.4) - nokogiri (>= 1.4.4) - uuidtools (~> 2.1) - builder (3.1.4) - cancan (1.6.10) - capybara (1.0.1) - 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.5.1) - ffi (~> 1.0, >= 1.0.11) - climate_control (0.0.3) - activesupport (>= 3.0) - cocaine (0.5.3) - climate_control (>= 0.0.3, < 1.0) - colorize (0.6.0) - deface (1.0.0) - colorize (>= 0.5.8) - nokogiri (~> 1.6.0) - rails (>= 3.1) - diff-lcs (1.2.5) - erubis (2.7.0) - factory_girl (2.6.4) - activesupport (>= 2.3.9) - ffaker (1.23.0) - ffi (1.9.3) - highline (1.6.20) - hike (1.2.3) - httparty (0.13.0) - json (~> 1.8) - multi_xml (>= 0.5.2) - i18n (0.6.9) - json (1.8.1) - kaminari (0.15.1) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) - mini_portile (0.5.2) - minitest (4.7.5) - monetize (0.1.4) - money (6.0.1) - i18n (~> 0.6.4) - monetize (~> 0.1.3) - multi_json (1.8.4) - multi_xml (0.5.5) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - paperclip (3.4.2) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.0) - mime-types - paranoia (2.0.2) - activerecord (~> 4.0) - polyamorous (0.6.4) - activerecord (>= 3.0) - polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) - rack (>= 1.0) - rails (4.0.3) - actionmailer (= 4.0.3) - actionpack (= 4.0.3) - activerecord (= 4.0.3) - activesupport (= 4.0.3) - bundler (>= 1.3.0, < 2.0) - railties (= 4.0.3) - sprockets-rails (~> 2.0.0) - railties (4.0.3) - actionpack (= 4.0.3) - activesupport (= 4.0.3) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.1.1) - ransack (1.1.0) - actionpack (>= 3.0) - activerecord (>= 3.0) - polyamorous (~> 0.6.0) - rspec-core (2.14.7) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.5) - rspec-rails (2.14.1) - actionpack (>= 3.0) - activemodel (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rubyzip (1.1.0) - selenium-webdriver (2.40.0) - childprocess (>= 0.5.0) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0.4) - spree_core (2.1.5) - activemerchant (~> 1.42.3) - acts_as_list (= 0.3.0) - awesome_nested_set (~> 3.0.0.rc.3) - aws-sdk (= 1.27.0) - cancan (~> 1.6.10) - deface (~> 1.0.0) - ffaker (~> 1.16) - highline (~> 1.6.18) - httparty (~> 0.11) - json (~> 1.7) - kaminari (~> 0.15.0) - paperclip (~> 3.4.1) - paranoia (~> 2.0) - rails (~> 4.0.0) - ransack (= 1.1.0) - state_machine (= 1.2.0) - stringex (~> 1.5.1) - truncate_html (= 0.9.2) - sprockets (2.11.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.8) - state_machine (1.2.0) - stringex (1.5.1) - thor (0.18.1) - thread_safe (0.1.3) - atomic - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - truncate_html (0.9.2) - tzinfo (0.3.38) - uuidtools (2.1.4) - websocket (1.0.7) - xpath (0.1.4) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - capybara (= 1.0.1) - factory_girl (~> 2.6.4) - ffaker - rspec-rails (~> 2.9) - spree_product_zoom! - sqlite3 diff --git a/spree_product_zoom.gemspec b/spree_product_zoom.gemspec index b384c47..d980a83 100644 --- a/spree_product_zoom.gemspec +++ b/spree_product_zoom.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.2.0.beta' + s.add_dependency 'spree_core', '~> 2.2.0' s.add_development_dependency 'capybara', '1.0.1' s.add_development_dependency 'factory_girl', '~> 2.6.4'