diff --git a/Gemfile b/Gemfile index 94d3f70793..20bd0bd4e0 100644 --- a/Gemfile +++ b/Gemfile @@ -5,16 +5,16 @@ gem 'rails', '3.2.14' gem 'pg' gem 'spree', :github => 'eaterprises/spree', :branch => '1-3-stable' -gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git' -gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-3-stable' -gem 'spree_last_address', :git => 'git://github.com/eaterprises/spree-last-address.git', :branch => '1-3-stable' -gem 'spree_auth_devise', :git => 'https://github.com/spree/spree_auth_devise.git', :branch => '1-3-stable' +gem 'spree_i18n', :github => 'spree/spree_i18n' +gem 'spree_paypal_express', :github => 'spree/spree_paypal_express', :branch => '1-3-stable' +gem 'spree_last_address', :github => 'eaterprises/spree-last-address', :branch => '1-3-stable' +gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable' gem 'comfortable_mexican_sofa' # Fix bug in simple_form preventing collection_check_boxes usage within form_for block # When merged, revert to upstream gem -gem 'simple_form', :git => 'git://github.com/RohanM/simple_form.git' +gem 'simple_form', :github => 'RohanM/simple_form' gem 'unicorn' gem 'bugsnag' @@ -49,7 +49,7 @@ group :assets do gem 'uglifier', '>= 1.0.3' gem 'turbo-sprockets-rails3' - gem 'zurb-foundation', :git => 'git://github.com/zurb/foundation.git' + gem 'zurb-foundation', :github => 'zurb/foundation' end gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index b1b7b4846c..e66f1985dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,6 +73,17 @@ GIT nokogiri (~> 1.6.0) rails (>= 3.1) +GIT + remote: git://github.com/spree/spree_auth_devise.git + revision: 6a50345b73bcec614a8fbd358a2367c00c8ab56f + branch: 1-3-stable + specs: + spree_auth_devise (1.0.0) + cancan (~> 1.6.7) + devise (~> 2.2.3) + devise-encryptable (= 0.1.2) + spree_core + GIT remote: git://github.com/spree/spree_i18n.git revision: a96bee02340e008e60549295a4f09e047fd2e628 @@ -96,17 +107,6 @@ GIT zurb-foundation (4.3.1) sass (>= 3.2.0) -GIT - remote: https://github.com/spree/spree_auth_devise.git - revision: b2b82f1bbe4b47a0713bcf70af8b3c17fa39c0d0 - branch: 1-3-stable - specs: - spree_auth_devise (1.0.0) - cancan (~> 1.6.7) - devise (~> 2.2.3) - devise-encryptable (= 0.1.2) - spree_core - PATH remote: lib/chili/eaterprises_feature specs: @@ -183,7 +183,7 @@ GEM json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.1.2) bugsnag (1.2.4) httparty (>= 0.5, < 1.0) multi_json (~> 1.0) @@ -236,7 +236,7 @@ GEM debugger-ruby_core_source (~> 1.2.3) debugger-linecache (1.2.0) debugger-ruby_core_source (1.2.3) - devise (2.2.4) + devise (2.2.7) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) @@ -456,7 +456,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - warden (1.2.1) + warden (1.2.3) rack (>= 1.0) webmock (1.13.0) addressable (>= 2.2.7)