From 6bd115488645cc02491d116c4182c24da57107fb Mon Sep 17 00:00:00 2001 From: Didier Lafforgue Date: Mon, 2 Apr 2012 21:46:23 +0200 Subject: [PATCH] use the last version of mongoid / rails + bump the new gem version (rc.4) --- Gemfile.lock | 58 +++++++++++++++++++-------------------- README.textile | 8 +++--- lib/locomotive/version.rb | 2 +- locomotive_cms.gemspec | 4 +-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 21146cdd..55ff43f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,7 @@ GIT PATH remote: . specs: - locomotive_cms (2.0.0.rc3) + locomotive_cms (2.0.0.rc4) RedCloth (~> 4.2.8) actionmailer-with-request (~> 0.3.0) bson_ext (~> 1.5.2) @@ -54,9 +54,9 @@ PATH locomotive_liquid (= 2.2.2) mimetype-fu (~> 0.1.2) mongo (~> 1.5.2) - mongoid (~> 2.4.5) + mongoid (~> 2.4.6) rack-cache (~> 1.1) - rails (~> 3.2.1) + rails (~> 3.2.3) rails-backbone (~> 0.6.1) rake (~> 0.9.2) responders (~> 0.6.4) @@ -67,33 +67,33 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) + actionmailer (3.2.3) + actionpack (= 3.2.3) + mail (~> 2.4.4) actionmailer-with-request (0.3.0) rails (>= 3) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionpack (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + activemodel (3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + activesupport (3.2.3) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.7) @@ -236,21 +236,21 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.3) + actionmailer (= 3.2.3) + actionpack (= 3.2.3) + activerecord (= 3.2.3) + activeresource (= 3.2.3) + activesupport (= 3.2.3) bundler (~> 1.0) - railties (= 3.2.2) + railties (= 3.2.3) rails-backbone (0.6.1) coffee-script (~> 2.2.0) ejs (~> 1.0.0) railties (>= 3.1.0) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (3.2.3) + actionpack (= 3.2.3) + activesupport (= 3.2.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) diff --git a/README.textile b/README.textile index e69a57fe..f65cc18d 100644 --- a/README.textile +++ b/README.textile @@ -24,8 +24,8 @@ h2. Gems Here is a short list of main gems / technologies used in the application. -* Rails 3.2 -* Mongoid 2.4.3 (with MongoDB 2.0) +* Rails 3.2.3 +* Mongoid 2.4.6 (with MongoDB 2.0) * Liquid * Devise * Carrierwave @@ -44,7 +44,7 @@ We work on the procedure to upgrade from a previous version of the engine (below h2. Community -* Get help or discuss locomotive CMS at the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ +* Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms or the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ (deprecated) * Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/ * "Follow us on twitter":http://twitter.com/locomotiveapp @@ -60,7 +60,7 @@ Locomotive CMS is an open source project, we encourage contributions. If you hav * Make the tests pass * "Create a GitHub pull request":http://help.github.com/send-pull-requests -For new features (especially large ones) it is best to create a topic on the "discussion forums":http://locomotive.vanillaforums.com/ first to make sure it fits into the goals of the project. +For new features (especially large ones) it is best to create a topic on the "Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms first to make sure it fits into the goals of the project. h2. Team diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb index 69b7d30f..84625dda 100644 --- a/lib/locomotive/version.rb +++ b/lib/locomotive/version.rb @@ -1,3 +1,3 @@ module Locomotive #:nodoc - VERSION = '2.0.0.rc3' + VERSION = '2.0.0.rc4' end diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index b8d98825..5bec1508 100755 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -20,14 +20,14 @@ Gem::Specification.new do |s| s.add_dependency 'rake', '~> 0.9.2' - s.add_dependency 'rails', '~> 3.2.1' + s.add_dependency 'rails', '~> 3.2.3' s.add_dependency 'devise', '~> 1.5.3' s.add_dependency 'cancan', '~> 1.6.7' s.add_dependency 'mongo', '~> 1.5.2' s.add_dependency 'bson_ext', '~> 1.5.2' - s.add_dependency 'mongoid', '~> 2.4.5' + s.add_dependency 'mongoid', '~> 2.4.6' s.add_dependency 'locomotive-mongoid-tree', '~> 0.6.2' s.add_dependency 'custom_fields', '~> 2.0.0.rc9'