diff --git a/Gemfile b/Gemfile index 5fef02966a..943aef58be 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,8 @@ gem 'deface', :github => 'spree/deface' gem 'paperclip' gem 'geocoder' gem 'gmaps4rails' +gem 'spinjs-rails' +gem 'rack-ssl', :require => 'rack/ssl' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index f070db7595..748677589e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,6 +400,8 @@ GEM simplecov-html (~> 0.7.1) simplecov-html (0.7.1) slop (3.4.5) + spinjs-rails (1.3) + rails (>= 3.1) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -476,6 +478,7 @@ DEPENDENCIES poltergeist pry-debugger rabl + rack-ssl rails (= 3.2.13) representative_view rspec-rails @@ -484,6 +487,7 @@ DEPENDENCIES shoulda-matchers simple_form! simplecov + spinjs-rails spree! spree_auth_devise! spree_i18n!