Bump to master

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: '3-0-stable'
+gem 'spree', github: 'spree/spree', branch: 'master'
 
 gemspec

Gemfile.lock

@@ -1,30 +1,30 @@
 GIT
   remote: git://github.com/spree/spree.git
-  revision: 9ef01bc44c187e4d5ed784d8b69b9f56eb78677a
-  branch: 3-0-stable
+  revision: 583b27d7e0824daf0492c5f54c8c327bc0ca2f6f
+  branch: master
   specs:
-    spree (3.0.0)
-      spree_api (= 3.0.0)
-      spree_backend (= 3.0.0)
-      spree_cmd (= 3.0.0)
-      spree_core (= 3.0.0)
-      spree_frontend (= 3.0.0)
-      spree_sample (= 3.0.0)
-    spree_api (3.0.0)
+    spree (3.1.0.beta)
+      spree_api (= 3.1.0.beta)
+      spree_backend (= 3.1.0.beta)
+      spree_cmd (= 3.1.0.beta)
+      spree_core (= 3.1.0.beta)
+      spree_frontend (= 3.1.0.beta)
+      spree_sample (= 3.1.0.beta)
+    spree_api (3.1.0.beta)
       rabl (~> 0.9.4.pre1)
-      spree_core (= 3.0.0)
+      spree_core (= 3.1.0.beta)
       versioncake (~> 2.3.1)
-    spree_backend (3.0.0)
+    spree_backend (3.1.0.beta)
       bootstrap-sass (~> 3.3.1)
       jquery-rails (~> 4.0.3)
       jquery-ui-rails (~> 5.0.0)
       select2-rails (= 3.5.9.1)
-      spree_api (= 3.0.0)
-      spree_core (= 3.0.0)
+      spree_api (= 3.1.0.beta)
+      spree_core (= 3.1.0.beta)
       sprockets-rails (~> 2.2)
-    spree_cmd (3.0.0)
+    spree_cmd (3.1.0.beta)
       thor (~> 0.14)
-    spree_core (3.0.0)
+    spree_core (3.1.0.beta)
       activemerchant (~> 1.46.0)
       acts_as_list (~> 0.6)
       awesome_nested_set (~> 3.0.1)
@@ -49,24 +49,24 @@ GIT
       stringex
       truncate_html (= 0.9.2)
       twitter_cldr (~> 3.0)
-    spree_frontend (3.0.0)
+    spree_frontend (3.1.0.beta)
       bootstrap-sass (~> 3.3.1)
       canonical-rails (~> 0.0.4)
       jquery-rails (~> 4.0.3)
-      spree_api (= 3.0.0)
-      spree_core (= 3.0.0)
+      spree_api (= 3.1.0.beta)
+      spree_core (= 3.1.0.beta)
       sprockets-rails (~> 2.2)
-    spree_sample (3.0.0)
-      spree_core (= 3.0.0)
+    spree_sample (3.1.0.beta)
+      spree_core (= 3.1.0.beta)
 
 PATH
   remote: .
   specs:
     spree_comments (3.0.0)
       acts_as_commentable (= 4.0.1)
-      spree_api (~> 3.0.0)
-      spree_backend (~> 3.0.0)
-      spree_core (~> 3.0.0)
+      spree_api (~> 3.1.0.beta)
+      spree_backend (~> 3.1.0.beta)
+      spree_core (~> 3.1.0.beta)
 
 GEM
   remote: https://rubygems.org/
@@ -240,7 +240,7 @@ GEM
       polyamorous (~> 1.1)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
-    rspec-core (3.2.1)
+    rspec-core (3.2.2)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)

app/controllers/spree/admin/shipments_controller_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Api::ShipmentsController.class_eval do
+Spree::Api::V1::ShipmentsController.class_eval do
   def comments
     shipment
     @comment_types = Spree::CommentType.where(:applies_to => "Shipment")

spree_comments.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.requirements << 'none'
 
-  spree_version = '~> 3.0.0'
+  spree_version = '~> 3.1.0.beta'
   s.add_dependency 'spree_api', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_core', spree_version