Skip to content

Commit

Permalink
Bump for spree edge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Dutil authored and Jeff Dutil committed Jan 13, 2015
1 parent c2053c4 commit 6bb42a8
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'

gem 'spree', github: 'spree/spree', branch: '2-4-stable'
gem 'spree', github: 'spree/spree', branch: 'master'

gemspec
63 changes: 35 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
GIT
remote: git://github.com/spree/spree.git
revision: f20b46c9f2f48c6600769f5f34777eeb29eef6d3
branch: 2-4-stable
revision: dce6b8c98901841f1c44fed67b2427b79e4bad20
branch: master
specs:
spree (2.4.3.beta)
spree_api (= 2.4.3.beta)
spree_backend (= 2.4.3.beta)
spree_cmd (= 2.4.3.beta)
spree_core (= 2.4.3.beta)
spree_frontend (= 2.4.3.beta)
spree_sample (= 2.4.3.beta)
spree_api (2.4.3.beta)
spree (3.0.0.beta)
spree_api (= 3.0.0.beta)
spree_backend (= 3.0.0.beta)
spree_cmd (= 3.0.0.beta)
spree_core (= 3.0.0.beta)
spree_frontend (= 3.0.0.beta)
spree_sample (= 3.0.0.beta)
spree_api (3.0.0.beta)
rabl (~> 0.9.4.pre1)
spree_core (= 2.4.3.beta)
spree_core (= 3.0.0.beta)
versioncake (~> 2.3.1)
spree_backend (2.4.3.beta)
spree_backend (3.0.0.beta)
bootstrap-sass (~> 3.3.1)
jquery-rails (~> 3.1.2)
jquery-ui-rails (~> 5.0.0)
select2-rails (~> 3.5.0)
spree_api (= 2.4.3.beta)
spree_core (= 2.4.3.beta)
spree_cmd (2.4.3.beta)
spree_api (= 3.0.0.beta)
spree_core (= 3.0.0.beta)
sprockets-rails (~> 2.2.1)
spree_cmd (3.0.0.beta)
thor (~> 0.14)
spree_core (2.4.3.beta)
spree_core (3.0.0.beta)
activemerchant (~> 1.44.1)
acts_as_list (~> 0.3)
acts_as_list (~> 0.5.0)
awesome_nested_set (~> 3.0.1)
cancancan (~> 1.9.2)
carmen (~> 1.0.0)
Expand All @@ -43,25 +45,27 @@ GIT
rails (~> 4.1.8)
ransack (~> 1.4.1)
state_machine (= 1.2.0)
stringex (~> 1.5.1)
stringex
truncate_html (= 0.9.2)
twitter_cldr (~> 3.0)
spree_frontend (2.4.3.beta)
spree_frontend (3.0.0.beta)
bootstrap-sass (~> 3.3.1)
canonical-rails (~> 0.0.4)
jquery-rails (~> 3.1.2)
spree_api (= 2.4.3.beta)
spree_core (= 2.4.3.beta)
spree_sample (2.4.3.beta)
spree_core (= 2.4.3.beta)
spree_api (= 3.0.0.beta)
spree_core (= 3.0.0.beta)
sprockets-rails (~> 2.2.1)
spree_sample (3.0.0.beta)
spree_core (= 3.0.0.beta)

PATH
remote: .
specs:
spree_comments (2.0.0)
acts_as_commentable (= 4.0.1)
spree_api (~> 2.4.2)
spree_backend (~> 2.4.2)
spree_core (~> 2.4.2)
spree_api (~> 3.0.0.beta)
spree_backend (~> 3.0.0.beta)
spree_core (~> 3.0.0.beta)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -104,12 +108,14 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 1.1)
acts_as_commentable (4.0.1)
acts_as_list (0.6.0)
acts_as_list (0.5.0)
activerecord (>= 3.0)
addressable (2.3.6)
arel (5.0.1.20140414130214)
awesome_nested_set (3.0.2)
activerecord (>= 4.0.0, < 5)
bootstrap-sass (3.3.1.0)
sass (~> 3.2)
builder (3.2.2)
camertron-eprun (1.1.0)
cancancan (1.9.2)
Expand Down Expand Up @@ -233,6 +239,7 @@ GEM
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
sass (3.4.9)
select2-rails (3.5.9.1)
thor (~> 0.14)
sprockets (2.12.3)
Expand All @@ -246,7 +253,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
state_machine (1.2.0)
stringex (1.5.1)
stringex (2.5.2)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
Expand Down
2 changes: 1 addition & 1 deletion spree_comments.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

spree_version = '~> 2.4.2'
spree_version = '~> 3.0.0.beta'
s.add_dependency 'spree_api', spree_version
s.add_dependency 'spree_backend', spree_version
s.add_dependency 'spree_core', spree_version
Expand Down

0 comments on commit 6bb42a8

Please sign in to comment.