Permalink
Browse files

Update Gemfile.lock

  • Loading branch information...
1 parent dc2010f commit 17e1926b005983acdb6236394e53d75103d5d289 @BDQ committed Apr 12, 2012
Showing with 19 additions and 3 deletions.
  1. +2 −1 Gemfile
  2. +17 −2 Gemfile.lock
View
@@ -14,7 +14,7 @@ end
gem 'jquery-rails'
-gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-1-stable-before-force'
+gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-1-stable'
# gem 'spree_spraycan', :path => '../spree_spraycan'
@@ -37,5 +37,6 @@ group :development do
gem 'capistrano'
gem 'mysql2'
gem 'yaml_db'
+ gem 'ruby-debug19'
end
View
@@ -30,8 +30,8 @@ GIT
GIT
remote: git://github.com/spree/spree.git
- revision: 27bca97223aa0ac47638a1e2f892527c356417f0
- branch: 1-1-stable-before-force
+ revision: fcbaa6bffa0ef407c822fbb4dd6964381fa7ac66
+ branch: 1-1-stable
specs:
spree (1.1.0.rc1)
spree_api (= 1.1.0.rc1)
@@ -117,6 +117,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.4)
+ archive-tar-minitar (0.5.2)
arel (3.0.2)
aws-sdk (1.3.9)
httparty (~> 0.7)
@@ -145,6 +146,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
+ columnize (0.3.6)
compass (0.12.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -182,6 +184,8 @@ GEM
railties (>= 3.0.0)
kgio (2.7.4)
libv8 (3.3.10.4)
+ linecache19 (0.5.13)
+ ruby_core_source (>= 0.1.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -245,6 +249,16 @@ GEM
polyamorous (~> 0.5.0)
rdoc (3.12)
json (~> 1.4)
+ ruby-debug-base19 (0.11.26)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
sass (3.1.15)
sass-rails (3.2.5)
railties (~> 3.2.0)
@@ -290,6 +304,7 @@ DEPENDENCIES
json
mysql2
rails (= 3.2.2)
+ ruby-debug19
sass-rails (~> 3.2.3)
spraycan!
spree!

0 comments on commit 17e1926

Please sign in to comment.