Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Gem changes, asset changes to get demo working with spree 1.1

  • Loading branch information...
commit c181c7a820436bd685655185a7d7c5b4371441aa 1 parent c19beac
@GeekOnCoffee GeekOnCoffee authored
View
15 Gemfile
@@ -3,32 +3,33 @@ source 'http://rubygems.org'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.3'
gem 'mysql2'
-
+gem 'sqlite3'
gem 'aws-sdk'
gem 'airbrake'
-gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-0-stable'
+gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-1-stable'
gem 'spree_recently_viewed', :git => 'git://github.com/spree/spree_recently_viewed.git'
gem 'spree_related_products', :git => 'git://github.com/spree/spree_related_products.git'
-gem 'spree_social', :git => 'git://github.com/spree/spree_social.git', :branch => 'debug-env'
+gem 'spree_social', :git => 'git://github.com/spree/spree_social.git', :branch => 'master'
gem 'spree_wishlist', :git => 'git://github.com/spree/spree_wishlist.git'
gem 'spree_email_to_friend', :git => 'git://github.com/spree/spree_email_to_friend.git'
-gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git', :branch => '1-0-stable'
+gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git', :branch => 'master'
gem 'spree_editor', :git => 'git://github.com/spree/spree_editor.git'
gem 'tinymce-rails', '>= 3.4.7.0.1'
gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git'
gem 'spree_active_shipping', :git => 'git://github.com/spree/spree_active_shipping.git'
+gem 'active_shipping', :git => 'git://github.com/Shopify/active_shipping.git'
gem 'spree_rdr_theme', :git => 'git://github.com/spree/spree_rdr_theme.git'
gem 'capistrano'
group :assets do
- gem 'sass-rails', "~> 3.1.0"
- gem 'coffee-rails', "~> 3.1.0"
+ gem 'sass-rails', "~> 3.2.0"
+ gem 'coffee-rails', "~> 3.2.0"
gem 'uglifier'
end
View
1  app/assets/javascripts/admin/all.js
@@ -7,7 +7,6 @@
//= require admin/spree_core
//= require admin/spree_auth
-//= require admin/spree_api
//= require admin/spree_promo
//= require_tree .
View
3  app/assets/javascripts/store/all.js
@@ -4,10 +4,9 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
-
+//= require jquery
//= require store/spree_core
//= require store/spree_auth
-//= require store/spree_api
//= require store/spree_promo
//= require_tree .
View
1  app/assets/stylesheets/admin/all.css
@@ -6,7 +6,6 @@
*= require admin/spree_core
*= require admin/spree_auth
- *= require admin/spree_api
*= require admin/spree_promo
*= require_self
View
1  app/assets/stylesheets/store/all.css
@@ -5,7 +5,6 @@
*
*= require store/spree_auth
- *= require store/spree_api
*= require store/spree_promo
*= require_self
Please sign in to comment.
Something went wrong with that request. Please try again.