diff options
-rw-r--r-- | Gemfile | 3 | ||||
-rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 10 insertions, 4 deletions
@@ -39,7 +39,8 @@ gem 'syslog_protocol' gem 'newrelic_rpm' # Use until this PR is merged: https://github.com/svenfuchs/globalize3/pull/191 gem 'globalize3', :git => 'git://github.com/henare/globalize3.git', :branch => 'not-null-empty-attributes' -gem 'acts_as_versioned' +# New gem releases aren't being done. master is newer and supports Rails > 3.0 +gem 'acts_as_versioned', :git => 'git://github.com/technoweenie/acts_as_versioned.git' gem 'dynamic_form' group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 37697a6d1..ae8c9a2f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,13 @@ GIT activerecord (>= 3.0.0) paper_trail (~> 2) +GIT + remote: git://github.com/technoweenie/acts_as_versioned.git + revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b + specs: + acts_as_versioned (0.6.0) + activerecord (>= 3.0.9) + GEM remote: http://rubygems.org/ specs: @@ -38,8 +45,6 @@ GEM activemodel (= 3.0.17) activesupport (= 3.0.17) activesupport (3.0.17) - acts_as_versioned (0.6.0) - activerecord (~> 3.0.0.beta4) annotate (2.5.0) rake arel (2.0.10) @@ -212,7 +217,7 @@ PLATFORMS ruby DEPENDENCIES - acts_as_versioned + acts_as_versioned! annotate bootstrap-sass capistrano |