From a90d79330b410707eef39240ee79fb706c37565d Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 1 Sep 2015 08:44:32 -0300 Subject: Add master branch to github gems to be able to use local clones --- Gemfile | 8 ++++---- Gemfile.lock | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index a398387947..b831a265d0 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,8 @@ gemspec gem 'rake', '>= 10.3' # Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet. -gem 'globalid', github: 'rails/globalid' -gem 'rack', github: 'rack/rack' +gem 'globalid', github: 'rails/globalid', branch: 'master' +gem 'rack', github: 'rack/rack', branch: 'master' # This needs to be with require false as it is # loaded after loading the test library to @@ -19,7 +19,7 @@ gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' gem 'arel', github: 'rails/arel', branch: 'master' -gem 'mail', github: 'mikel/mail' +gem 'mail', github: 'mikel/mail', branch: 'master' gem 'sprockets', github: 'rails/sprockets', branch: 'master' gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' @@ -52,7 +52,7 @@ group :job do gem 'sidekiq', require: false gem 'sucker_punch', require: false gem 'delayed_job', require: false - gem 'queue_classic', github: "QueueClassic/queue_classic", require: false, platforms: :ruby + gem 'queue_classic', github: "QueueClassic/queue_classic", branch: 'master', require: false, platforms: :ruby gem 'sneakers', require: false gem 'que', require: false gem 'backburner', require: false diff --git a/Gemfile.lock b/Gemfile.lock index ae2f00df2e..0c56999892 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GIT remote: git://github.com/QueueClassic/queue_classic.git revision: d144db29f1436e9e8b3c7a1a1ecd4442316a9ecd + branch: master specs: queue_classic (3.2.0.alpha) pg (>= 0.17, < 0.19) @@ -21,13 +22,15 @@ GIT GIT remote: git://github.com/mikel/mail.git revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce + branch: master specs: mail (2.6.3.edge) mime-types (>= 1.16, < 3) GIT remote: git://github.com/rack/rack.git - revision: 2fe4a79667603a0c3d636daec06281459b10f7f8 + revision: 6c4160b8c5173299f4b49ea2c9e4aab76f6b9054 + branch: master specs: rack (2.0.0.alpha) json @@ -42,16 +45,17 @@ GIT GIT remote: git://github.com/rails/globalid.git revision: 8178ff2dc898a8f49dd71f6eb46f2a09712462de + branch: master specs: globalid (0.3.6) activesupport (>= 4.1.0) GIT remote: git://github.com/rails/jquery-rails.git - revision: 38053f45402f1ccc4cce5dd8c7005ec707376db3 + revision: 01cb69b17083c8eb8daba13a8daba4907b1c3813 branch: master specs: - jquery-rails (4.0.4) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -79,7 +83,7 @@ GIT GIT remote: git://github.com/rails/sprockets.git - revision: a61550db7184fc83964fb983547ff09da9efa9be + revision: 408e4ad79df056f6f2199e495782363c22a95c04 branch: master specs: sprockets (4.0.0) -- cgit v1.2.3