From 1be9c83d04979197f0106a5ee9cb8ba76fd180ce Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Wed, 7 May 2014 18:39:13 -0300 Subject: [PATCH] Allow bundle local repos to be used Add branch option to github repos in Gemfile. --- Gemfile | 6 +++--- Gemfile.lock | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 798a0ec6..ea8962c6 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ platforms :rbx do end gem 'country_select', '~> 1.1.1' -gem 'railties', github: 'rails/rails' -gem 'activemodel', github: 'rails/rails' -gem 'actionpack', github: 'rails/rails' +gem 'railties', github: 'rails/rails', branch: 'master' +gem 'activemodel', github: 'rails/rails', branch: 'master' +gem 'actionpack', github: 'rails/rails', branch: 'master' gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 314811cc..e81fa008 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GIT remote: git://github.com/rails/rails.git - revision: e918516d2fdfa24e5fc04ef14e371f08f4a8315f + revision: a8d85c4d518e8ed73ac8a5685bfb2a2a842900fd + branch: master specs: actionpack (4.2.0.alpha) actionview (= 4.2.0.alpha)