fix liquid gem version + require httparty + bump to 0.0.2.8

This commit is contained in:
dinedine 2010-07-06 23:44:24 +02:00
parent 96e4753ed6
commit 4e2e6411f3
5 changed files with 5 additions and 4 deletions

View File

@ -4,7 +4,7 @@ source 'http://gems.github.com'
gem 'rails', '3.0.0.beta3' gem 'rails', '3.0.0.beta3'
gem 'liquid' gem 'liquid', '2.0.0'
gem 'bson_ext', '>= 1.0.1' gem 'bson_ext', '>= 1.0.1'
gem 'mongo_ext' gem 'mongo_ext'
gem 'mongoid', '2.0.0.beta6' gem 'mongoid', '2.0.0.beta6'

View File

@ -24,7 +24,7 @@ begin
"{app}/**/*", "{app}/**/*",
"{config}/**/*", "{config}/**/*",
"{lib}/**/*", "{lib}/**/*",
"{public}/stylesheets/**/*", "{public}/javascripts/**/*", "{public}/images/**/*", "{public}/stylesheets/admin/**/*", "{public}/javascripts/admin/**/*", "{public}/images/admin/**/*",
"{vendor}/**/*"] "{vendor}/**/*"]
# other fields that would normally go in your gemspec # other fields that would normally go in your gemspec
# like authors, email and has_rdoc can also be included here # like authors, email and has_rdoc can also be included here

View File

@ -1 +1 @@
0.0.2.7 0.0.2.8

View File

@ -7,6 +7,7 @@ require 'carrierwave'
require 'formtastic' require 'formtastic'
require 'mongoid' require 'mongoid'
require 'mongoid_acts_as_tree' require 'mongoid_acts_as_tree'
require 'httparty'
# FIXME: get rid of it once custom_fields is a gem # FIXME: get rid of it once custom_fields is a gem
require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb' require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'

View File

@ -2,7 +2,7 @@ module Locomotive
module Httparty module Httparty
class Webservice class Webservice
include HTTParty include ::HTTParty
def self.consume(url, options = {}) def self.consume(url, options = {})
url = HTTParty.normalize_base_uri(url) url = HTTParty.normalize_base_uri(url)