Skip to content

Commit

Permalink
Revert "Updated Spree and extension versions"
Browse files Browse the repository at this point in the history 
This reverts commit 91862ac.
  • Loading branch information
@schof
schof committed May 6, 2011
1 parent 91862ac commit 7502bb0
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 106 deletions.
20 changes: 10 additions & 10 deletions Gemfile
View file
Expand Up @@ -5,21 +5,21 @@ source 'http://rubygems.org'

gem 'mysql'
gem 'sqlite3'
gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => "0-60-stable"
gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => "0-50-stable"
gem 'aws-s3'
gem 'jammit', '0.6.0'

gem 'spree_recently_viewed', :git => 'git://github.com/spree/spree_recently_viewed.git', :ref => '546b63cbd591049d22dcfc71564cb453e73cad8c'
gem 'spree_recently_viewed', :git => 'git://github.com/jzw/spree_recently_viewed.git'
#disabling advanced_reporting as searchlogic is now removed
#gem 'advanced_reporting', :git => 'git://github.com/neerajdotname/spree-advanced-reporting', :branch => 'rails3'
gem 'spree_email_to_friend', :git => 'git://github.com/spree/spree_email_to_friend.git', :ref => '46217361d789520a563ff98e2596610ad99d4d51'
gem 'spree_related_products', :git => 'git://github.com/spree/spree_related_products.git', :ref => '2b74f44739a18f4d646d7bfc1424d994b3ffdc71'
gem 'spree_social', :git => 'git://github.com/spree/spree_social.git', :ref => "0d51b9d7a559f7d627300630656d40c4a6114489"
gem 'spree_wishlist', :git => 'git://github.com/spree/spree_wishlist.git', :ref => "5172de86dd46905e6d60288584b567155055675e"
gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git', :ref => '45b0050b96809c8fb0f21940f9407e9012a6d420'
gem 'spree_editor', :git => 'git://github.com/romul/spree_editor.git', :ref => 'da5c7fcb980d39a2e0f71a7f132463c28ef8c665'
gem 'spree_active_shipping', :git => 'git://github.com/spree/spree_active_shipping.git', :ref => 'cb4f80aeb9c9132201186e2febac58501fc7bf78'
gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :ref => '059f638a1f56179074e3c9af44608f2cb8f6d046'
gem 'spree_email_to_friend'
gem 'spree_related_products', :git => 'git://github.com/spree/spree_related_products.git'
gem 'spree_social', :git => 'git://github.com/spree/spree_social.git'
gem 'spree_wishlist', :git => 'git://github.com/spree/spree_wishlist.git', :branch => 'rails3'
gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git'
gem 'spree_editor', :git => 'git://github.com/romul/spree_editor.git'
gem 'spree_active_shipping', :git => 'git://github.com/spree/spree_active_shipping.git'
gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git'
gem 'hoptoad_notifier'
gem 'heroku'
gem 'hoe', '2.8.0' #prevents requirement of rubygem 1.4.0 - which is not supported by heroku
Expand Down
165 changes: 69 additions & 96 deletions Gemfile.lock
View file
@@ -1,31 +1,36 @@
GIT
remote: git://github.com/jzw/spree_recently_viewed.git
revision: 0c132204753f0fcf0d88e197522c400c8bd7dc4c
specs:
spree_recently_viewed (1.0.0)
spree_core (>= 0.40.0)

GIT
remote: git://github.com/romul/spree_editor.git
revision: da5c7fcb980d39a2e0f71a7f132463c28ef8c665
ref: da5c7fcb980d39a2e0f71a7f132463c28ef8c665
revision: 614d2b9d4913f228b3e8d1a3a411f284428c50b1
specs:
spree_editor (0.50.0)
spree_editor (0.40.0)
spree_core (>= 0.40.0)

GIT
remote: git://github.com/spree/spree.git
revision: 05749294b174d62d62b5e45c56987da25729b3b9
branch: 0-60-stable
revision: a3d33fadae2ae06822fb59865f84e6701d68682e
branch: 0-50-stable
specs:
spree (0.60.0.RC1)
spree_api (= 0.60.0.RC1)
spree_auth (= 0.60.0.RC1)
spree_core (= 0.60.0.RC1)
spree_dash (= 0.60.0.RC1)
spree_promo (= 0.60.0.RC1)
spree_sample (= 0.60.0.RC1)
spree_api (0.60.0.RC1)
spree_auth (= 0.60.0.RC1)
spree_core (= 0.60.0.RC1)
spree_auth (0.60.0.RC1)
spree (0.50.2)
spree_api (= 0.50.2)
spree_auth (= 0.50.2)
spree_core (= 0.50.2)
spree_dash (= 0.50.2)
spree_promo (= 0.50.2)
spree_sample (= 0.50.2)
spree_api (0.50.2)
spree_core (= 0.50.2)
spree_auth (0.50.2)
cancan (= 1.6.4)
devise (= 1.3.3)
spree_core (= 0.60.0.RC1)
spree_core (0.60.0.RC1)
devise (= 1.3.1)
spree_core (= 0.50.2)
spree_core (0.50.2)
activemerchant (= 1.12.0)
acts_as_list (= 0.1.2)
faker (= 0.9.5)
Expand All @@ -35,91 +40,64 @@ GIT
nested_set (= 1.6.4)
paperclip (= 2.3.8)
rails (= 3.0.7)
rd_find_by_param (= 0.1.1)
rd_resource_controller
rd_unobtrusive_date_picker (= 0.1.0)
state_machine (= 0.9.4)
stringex (= 1.0.3)
will_paginate (= 3.0.pre2)
spree_dash (0.60.0.RC1)
spree_core (= 0.60.0.RC1)
spree_promo (0.60.0.RC1)
spree_core (= 0.60.0.RC1)
spree_sample (0.60.0.RC1)
spree_core (= 0.60.0.RC1)
spree_dash (0.50.2)
spree_core (= 0.50.2)
spree_promo (0.50.2)
spree_core (= 0.50.2)
spree_sample (0.50.2)
spree_core (= 0.50.2)

GIT
remote: git://github.com/spree/spree_active_shipping.git
revision: cb4f80aeb9c9132201186e2febac58501fc7bf78
ref: cb4f80aeb9c9132201186e2febac58501fc7bf78
revision: c582a227417ddc55ed7011b3208d37113ce87f09
specs:
spree_active_shipping (1.0.3)
spree_active_shipping (1.0.2)
active_shipping (= 0.9.12)
spree_core (>= 0.30.1)

GIT
remote: git://github.com/spree/spree_email_to_friend.git
revision: 46217361d789520a563ff98e2596610ad99d4d51
ref: 46217361d789520a563ff98e2596610ad99d4d51
specs:
spree_email_to_friend (1.0.0)
recaptcha (>= 0.3.1)
spree_auth (>= 0.30.1)
spree_core (>= 0.30.1)

GIT
remote: git://github.com/spree/spree_paypal_express.git
revision: 059f638a1f56179074e3c9af44608f2cb8f6d046
ref: 059f638a1f56179074e3c9af44608f2cb8f6d046
revision: 39a3b00602d591e5c27bf13941aa5c13e4b95579
specs:
spree_paypal_express (1.0.0)
spree_core (>= 0.40.3)

GIT
remote: git://github.com/spree/spree_recently_viewed.git
revision: 546b63cbd591049d22dcfc71564cb453e73cad8c
ref: 546b63cbd591049d22dcfc71564cb453e73cad8c
specs:
spree_recently_viewed (1.0.0)
spree_core (>= 0.40.0)

GIT
remote: git://github.com/spree/spree_related_products.git
revision: 2b74f44739a18f4d646d7bfc1424d994b3ffdc71
ref: 2b74f44739a18f4d646d7bfc1424d994b3ffdc71
specs:
spree_related_products (3.0.2)
spree_core (>= 0.30.0)

GIT
remote: git://github.com/spree/spree_social.git
revision: 0d51b9d7a559f7d627300630656d40c4a6114489
ref: 0d51b9d7a559f7d627300630656d40c4a6114489
revision: bc3990a0c6cb48330922cae7c7b8d6b4d758d52a
specs:
spree_social (1.1.2)
evernote
oa-oauth (>= 0.2.2)
spree_auth (>= 0.60.0.RC1)
spree_core (>= 0.60.0.RC1)
spree_social (1.0.2)
oa-oauth (>= 0.1.6)
spree_auth (>= 0.40.0)
spree_core (>= 0.40.0)

GIT
remote: git://github.com/spree/spree_static_content.git
revision: 45b0050b96809c8fb0f21940f9407e9012a6d420
ref: 45b0050b96809c8fb0f21940f9407e9012a6d420
revision: 83c00ada55339fde59ca06b133f3b6494afcefb4
specs:
spree_static_content (0.40.2)
spree_static_content (0.40.1)
spree_core (>= 0.30.0)
spree_editor

GIT
remote: git://github.com/spree/spree_wishlist.git
revision: 5172de86dd46905e6d60288584b567155055675e
ref: 5172de86dd46905e6d60288584b567155055675e
revision: 568ff3be6ad9a5edbc9e1d571663fbb55b18ee8c
branch: rails3
specs:
spree_wishlist (1.1)
spree_auth (>= 0.30.0)
spree_core (>= 0.30.0)
spree_email_to_friend (>= 0.30.0.beta2)
spree_wishlist (0.30.0.beta2)
spree_core (>= 0.30.1)

GEM
remote: http://rubygems.org/
Expand Down Expand Up @@ -158,14 +136,14 @@ GEM
activesupport (= 3.0.7)
activesupport (3.0.7)
acts_as_list (0.1.2)
addressable (2.2.5)
addressable (2.2.4)
arel (2.0.9)
aws-s3 (0.6.2)
builder
mime-types
xml-simple
bcrypt-ruby (2.1.4)
braintree (2.10.0)
braintree (2.9.1)
builder
builder (2.1.2)
cancan (1.6.4)
Expand Down Expand Up @@ -196,25 +174,23 @@ GEM
rack-test (>= 0.5.7)
culerity (0.2.15)
database_cleaner (0.6.6)
devise (1.3.3)
devise (1.3.1)
bcrypt-ruby (~> 2.1.2)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
evernote (0.9.0)
thrift_client
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
railties (>= 3.0.0)
faker (0.9.5)
i18n (~> 0.4)
faraday (0.6.1)
faraday (0.5.7)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
rack (< 2, >= 1.1.0)
ffi (1.0.7)
rake (>= 0.8.7)
gherkin (2.3.5)
Expand Down Expand Up @@ -242,7 +218,7 @@ GEM
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
mail (2.2.19)
mail (2.2.17)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand All @@ -253,26 +229,25 @@ GEM
activesupport (~> 3.0.2)
arel (~> 2.0.2)
mime-types (1.16)
multi_json (1.0.1)
multi_xml (0.2.2)
multi_json (0.0.5)
multipart-post (1.1.0)
mysql (2.8.1)
nested_set (1.6.4)
activerecord (>= 3.0.0)
railties (>= 3.0.0)
nokogiri (1.4.4)
oa-core (0.2.5)
oa-oauth (0.2.5)
faraday (~> 0.6.1)
multi_json (~> 1.0.0)
multi_xml (~> 0.2.2)
oa-core (= 0.2.5)
oa-core (0.2.0)
rack (~> 1.1)
oa-oauth (0.2.0)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.2.0)
oauth (~> 0.4.0)
oauth2 (~> 0.4.1)
oauth2 (~> 0.1.1)
oauth (0.4.4)
oauth2 (0.4.1)
faraday (~> 0.6.1)
multi_json (>= 0.0.5)
oauth2 (0.1.1)
faraday (~> 0.5.0)
multi_json (~> 0.0.4)
orm_adapter (0.0.4)
paperclip (2.3.8)
activerecord
Expand All @@ -297,9 +272,6 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
rd_find_by_param (0.1.1)
activerecord (~> 3.0)
activesupport (~> 3.0)
rd_resource_controller (1.0.1)
rd_unobtrusive_date_picker (0.1.0)
recaptcha (0.3.1)
Expand Down Expand Up @@ -329,19 +301,20 @@ GEM
ffi (>= 1.0.7)
json_pure
rubyzip
spree_email_to_friend (1.0.0)
recaptcha (>= 0.3.1)
spree_auth (>= 0.30.1)
spree_core (>= 0.30.1)
sqlite3 (1.3.3)
state_machine (0.9.4)
stringex (1.0.3)
term-ansicolor (1.0.5)
thor (0.14.6)
thrift (0.5.0)
thrift_client (0.6.0)
thrift (~> 0.5.0)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
warden (1.0.4)
rack (>= 1.0)
tzinfo (0.3.26)
warden (1.0.3)
rack (>= 1.0.0)
will_paginate (3.0.pre2)
xml-simple (1.0.14)
xpath (0.1.3)
Expand All @@ -368,7 +341,7 @@ DEPENDENCIES
spree!
spree_active_shipping!
spree_editor!
spree_email_to_friend!
spree_email_to_friend
spree_paypal_express!
spree_recently_viewed!
spree_related_products!
Expand Down

0 comments on commit 7502bb0

Please sign in to comment.