aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-04 13:05:27 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-04 13:05:27 +0100
commitab14e3f8628da81535c09eab3ba48d06725c6769 (patch)
tree1409b4049bbc3075f7618a4759797dc6de2116d9 /activemodel
parent31248fe3698c8d6c54465dfdf463ea49749e1c33 (diff)
parentc9ec28b2b643de7a315276cc285d7a4506b9d568 (diff)
downloadrails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.gz
rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.bz2
rails-ab14e3f8628da81535c09eab3ba48d06725c6769.zip
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/activemodel.gemspec4
-rw-r--r--activemodel/lib/active_model/version.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index c3ff624419..64ae6e0760 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'activemodel'
- s.version = '3.0.pre'
+ s.version = '3.0.0.beta'
s.summary = "A toolkit for building other modeling frameworks like ActiveRecord"
s.description = %q{Extracts common modeling concerns from ActiveRecord to share between similar frameworks like ActiveResource.}
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.has_rdoc = true
- s.add_dependency('activesupport', '= 3.0.pre')
+ s.add_dependency('activesupport', '= 3.0.0.beta')
s.require_path = 'lib'
s.files = Dir["CHANGELOG", "MIT-LICENSE", "README", "lib/**/*"]
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index 0c233b7b4f..f569447bc8 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = "pre"
+ TINY = "0.beta"
STRING = [MAJOR, MINOR, TINY].join('.')
end