Skip to content
Extraits de code Groupes Projets
Valider 804777f9 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS; updated to released rails

parent 41afd86f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
source 'http://rubygems.org' source 'http://rubygems.org'
#gem 'rails', '3.0.0.rc' gem 'rails', '3.0.0'
#gem 'bundler', '1.0.0.rc.5' gem 'bundler', '1.0.0'
gem 'rails', '3.0.0.beta4'
gem 'bundler', '0.9.26'
#Security #Security
gem 'devise', :git => 'http://github.com/BadMinus/devise.git' gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
#Mongo #Mongo
gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git' #gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
#gem 'mongo_mapper', :git => 'http://github.com/jnunemaker/mongomapper.git' gem 'mongo_mapper', :git => 'http://github.com/jnunemaker/mongomapper.git'
gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git' #gem 'mongo_mapper', :git => 'http://github.com/collectiveidea/mongomapper.git', :branch => 'rails3'
#gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git'
gem 'jnunemaker-validatable', :git => 'http://github.com/jnunemaker/validatable.git'
gem 'mongo_ext' gem 'mongo_ext'
gem 'bson_ext', '1.0.4' gem 'bson_ext', '1.0.7'
gem 'bson', '1.0.4' gem 'bson', '1.0.7'
#Views #Views
gem 'haml' gem 'haml'
gem 'will_paginate', '3.0.pre' gem 'will_paginate', '3.0.pre2'
#Uncatagorized #Uncatagorized
gem 'roxml', :git => 'git://github.com/Empact/roxml.git' gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
......
...@@ -25,7 +25,7 @@ class Post ...@@ -25,7 +25,7 @@ class Post
after_destroy :destroy_comments after_destroy :destroy_comments
def self.instantiate params def self.instantiate params
self.create params self.create params.to_hash
end end
#ENCRYPTION #ENCRYPTION
......
...@@ -85,7 +85,7 @@ class User ...@@ -85,7 +85,7 @@ class User
group_ids = options.delete(:to) group_ids = options.delete(:to)
end end
group_ids = [group_ids] if group_ids.is_a? BSON::ObjectID group_ids = [group_ids] if group_ids.is_a? BSON::ObjectId
raise ArgumentError.new("You must post to someone.") if group_ids.nil? || group_ids.empty? raise ArgumentError.new("You must post to someone.") if group_ids.nil? || group_ids.empty?
model_class = class_name.to_s.camelize.constantize model_class = class_name.to_s.camelize.constantize
......
...@@ -16,6 +16,7 @@ module Diaspora ...@@ -16,6 +16,7 @@ module Diaspora
# Add additional load paths for your own custom dirs # Add additional load paths for your own custom dirs
#config.autoload_paths += %W(#{config.root}/lib) #config.autoload_paths += %W(#{config.root}/lib)
config.autoload_paths += %W(#{config.root}/lib)
# Only load the plugins named here, in the order given (default is alphabetical). # Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named # :all can be used as a placeholder for all plugins not explicitly named
......
class String class String
def to_id def to_id
BSON::ObjectID self BSON::ObjectId self
end end
end end
class BSON::ObjectID class BSON::ObjectId
def to_id def to_id
self self
end end
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter