From 5dd5567218debc42027e0cd45b148976137a2aed Mon Sep 17 00:00:00 2001 From: Nestor G Pestelos Jr Date: Sat, 4 May 2013 08:27:36 +0800 Subject: [PATCH] use HTTP URL to checkout active_model_serializers (fails during bundle) --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b9484f0ff48..80e9f287d4f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'active_model_serializers', git: 'git://github.com/rails-api/active_model_serializers.git' +gem 'active_model_serializers', git: 'https://github.com/rails-api/active_model_serializers.git' # we had issues with latest, stick to the rev till we figure this out # PR that makes it all hang together welcome diff --git a/Gemfile.lock b/Gemfile.lock index 9a26af76fa2..492b1fe0146 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,13 +38,6 @@ GIT execjs (>= 1.2) railties (>= 3.1) -GIT - remote: git://github.com/rails-api/active_model_serializers.git - revision: 329a38a7ddee4350f96d657256a5f6a277865291 - specs: - active_model_serializers (0.7.0) - activemodel (>= 3.0) - GIT remote: git://github.com/zhangyuan/vestal_versions revision: 0ea75ec4e269b5a9e609639919ade0f36381a446 @@ -53,6 +46,13 @@ GIT activerecord (>= 3.0.0) activesupport (>= 3.0.0) +GIT + remote: https://github.com/rails-api/active_model_serializers.git + revision: 7a39966e7ea47eb2f58962b6f0060ff3cbef4e65 + specs: + active_model_serializers (0.7.0) + activemodel (>= 3.0) + PATH remote: vendor/gems/discourse_emoji specs: