From 4030722a8fd8798c9a342013dc33745e525e1700 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 10 May 2013 11:50:58 +1000 Subject: [PATCH] gemfile cleanup, move git to https for better compat. --- Gemfile | 24 ++++++++++++------------ Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index 978f767a1c7..e56f2208650 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ gem 'active_model_serializers', git: 'https://github.com/rails-api/active_model_ # we had issues with latest, stick to the rev till we figure this out # PR that makes it all hang together welcome -gem 'ember-rails', git: 'git://github.com/emberjs/ember-rails.git', ref: '57bbe32' +gem 'ember-rails', git: 'https://github.com/emberjs/ember-rails.git', ref: '57bbe32' gem 'barber', '0.3.0' -gem 'vestal_versions', git: 'git://github.com/zhangyuan/vestal_versions' +gem 'vestal_versions', git: 'https://github.com/zhangyuan/vestal_versions' gem 'message_bus', path: 'vendor/gems/message_bus' gem 'rails_multisite', path: 'vendor/gems/rails_multisite' @@ -21,7 +21,7 @@ gem 'clockwork', require: false gem 'em-redis' gem 'eventmachine' gem 'fast_xs' -gem 'fast_xor', git: 'git://github.com/CodeMonkeySteve/fast_xor.git' +gem 'fast_xor', git: 'https://github.com/CodeMonkeySteve/fast_xor.git' gem 'fastimage' gem 'fog', require: false gem 'has_ip_address' @@ -38,13 +38,13 @@ gem 'jquery-rails' gem 'multi_json' gem 'mustache' gem 'nokogiri' -gem "omniauth" -gem "omniauth-openid" -gem "openid-redis-store" -gem "omniauth-facebook" -gem "omniauth-twitter" -gem "omniauth-github" -gem "omniauth-browserid", :git => "git://github.com/callahad/omniauth-browserid.git", :branch => "observer_api" +gem 'omniauth' +gem 'omniauth-openid' +gem 'openid-redis-store' +gem 'omniauth-facebook' +gem 'omniauth-twitter' +gem 'omniauth-github' +gem 'omniauth-browserid', git: 'https://github.com/callahad/omniauth-browserid.git', branch: 'observer_api' gem 'oj' gem 'pg' # we had pain with the 3.2.13 upgrade so monkey patch the security fix @@ -117,7 +117,7 @@ end # we are using a custom sprockets repo to work around: https://github.com/rails/rails/issues/8099#issuecomment-16137638 # REVIEW EVERY RELEASE -gem "sprockets", :git => "git://github.com/SamSaffron/sprockets.git", :branch => "rails-compat" +gem 'sprockets', git: 'https://github.com/SamSaffron/sprockets.git', branch: 'rails-compat' # this is an optional gem, it provides a high performance replacement @@ -136,7 +136,7 @@ gem 'rack-mini-profiler', require: false # require: false #, git: 'git://github # used for caching, optional # redis-rack-cache is missing a sane expiry policy, it hogs redis # https://github.com/jodosha/redis-store/pull/183 -gem 'redis-rack-cache', :git => 'git://github.com/SamSaffron/redis-rack-cache.git', require: false +gem 'redis-rack-cache', git: 'https://github.com/SamSaffron/redis-rack-cache.git', require: false gem 'rack-cache', require: false gem 'rack-cors', require: false diff --git a/Gemfile.lock b/Gemfile.lock index eb0467d2bcb..740bce7673d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git://github.com/CodeMonkeySteve/fast_xor.git + remote: https://github.com/CodeMonkeySteve/fast_xor.git revision: 85b79ec6d116f9680f23bd2c5c8c2c2039d477d8 specs: fast_xor (1.1.2) @@ -7,7 +7,7 @@ GIT rake-compiler GIT - remote: git://github.com/SamSaffron/redis-rack-cache.git + remote: https://github.com/SamSaffron/redis-rack-cache.git revision: 379ef30e31d4e185cb1d7f8badca0cc06403eba2 specs: redis-rack-cache (1.2.1) @@ -15,7 +15,7 @@ GIT redis-store (~> 1.1.0) GIT - remote: git://github.com/SamSaffron/sprockets.git + remote: https://github.com/SamSaffron/sprockets.git revision: bacf2ec4d4d10cd8d1ab25a6360740314c512237 branch: rails-compat specs: @@ -26,7 +26,7 @@ GIT tilt (~> 1.1, != 1.3.0) GIT - remote: git://github.com/callahad/omniauth-browserid.git + remote: https://github.com/callahad/omniauth-browserid.git revision: af62d667626c1622de6fe13b60849c3640765ab1 branch: observer_api specs: @@ -36,7 +36,7 @@ GIT omniauth (~> 1.0) GIT - remote: git://github.com/emberjs/ember-rails.git + remote: https://github.com/emberjs/ember-rails.git revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024 ref: 57bbe32 specs: @@ -46,14 +46,6 @@ GIT execjs (>= 1.2) railties (>= 3.1) -GIT - remote: git://github.com/zhangyuan/vestal_versions - revision: 0ea75ec4e269b5a9e609639919ade0f36381a446 - specs: - vestal_versions (1.2.2) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - GIT remote: https://github.com/rails-api/active_model_serializers.git revision: fe84e0ad5268f1439123fd9a1f9fd12e25a54cd3 @@ -61,6 +53,14 @@ GIT active_model_serializers (0.8.1) activemodel (>= 3.0) +GIT + remote: https://github.com/zhangyuan/vestal_versions + revision: 0ea75ec4e269b5a9e609639919ade0f36381a446 + specs: + vestal_versions (1.2.2) + activerecord (>= 3.0.0) + activesupport (>= 3.0.0) + PATH remote: vendor/gems/discourse_emoji specs: