Commit Graph

238 Commits

Author SHA1 Message Date
Pratik Naik
6f3c5f6787 Merge remote branch 'mainstream/master'
Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README
2010-02-14 19:28:05 +00:00
Xavier Noria
9fd9e5d4f7 fixes doc generation
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-10 14:37:56 -08:00
Mikel Lindsaar
5fe3dc4bf5 Adding ruby version spec to all gemspec files to at least 1.8.7
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-08 09:42:12 +01:00
Prem Sichanugrist
1d9d9d2d89 Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-06 15:51:44 +01:00
Jeremy Kemper
c548e21365 Bump git versions to 3.0.0.beta1 since we've released 2010-02-05 09:24:12 -08:00
Jeremy Kemper
459ecaf95d Submarine the rake-gemcutter dep in Rakefiles 2010-02-05 00:03:03 -08:00
Jeremy Kemper
7b81f5981f Fix task defines 2010-02-04 18:44:32 -08:00
Jeremy Kemper
c1785f3282 Release using gemcutter gem:push tasks 2010-02-04 18:28:45 -08:00
Pratik Naik
8260f0b40f Merge remote branch 'mainstream/master'
Conflicts:
	railties/guides/source/3_0_release_notes.textile
2010-02-04 13:14:44 +00:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Mikel Lindsaar
12681c2a71 Merge branch 'master' of git://github.com/rails/rails
Conflicts:
	activemodel/README
	activemodel/lib/active_model/errors.rb
	activemodel/lib/active_model/serialization.rb
	railties/guides/source/3_0_release_notes.textile
2010-02-02 14:04:23 +11:00
Mikel Lindsaar
d1eed079e1 Merge branch 'master' of git://github.com/rails/rails 2010-02-02 10:51:19 +11:00
Pratik Naik
fdcf4d6c51 Merge remote branch 'mainstream/master' 2010-02-01 23:42:38 +00:00
Carl Lerche
9f01dff9c2 Get rails tests running on bundler 0.9 2010-01-31 19:13:43 -08:00
Mikel Lindsaar
65ad16568c Updating copyright dates on all licenses 2010-02-01 10:10:53 +11:00
Mikel Lindsaar
a07d0f8786 Full update on ActiveModel documentation 2010-02-01 10:08:20 +11:00
Pratik Naik
ed60021f39 Merge remote branch 'mainstream/master'
Conflicts:
	activemodel/lib/active_model/state_machine.rb
2010-01-31 14:32:26 +00:00
Joshua Peek
db49c706b6 Axe AM state machine
We're going do it eventually, get it done before 3.0 is final.
2010-01-30 18:38:01 -06:00
José Valim
d6e2f5013c Drop AR I18n deprecation and simple use errors.messages as fallback. 2010-01-30 13:12:12 +01:00
Pratik Naik
efd0bd3b73 Merge remote branch 'mainstream/master' 2010-01-24 01:33:18 +05:30
Yehuda Katz
1a50d2e66a Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!) 2010-01-19 22:35:26 -08:00
Pratik Naik
c71120e29c Merge remote branch 'mainstream/master' 2010-01-19 13:40:26 +05:30
Mikel Lindsaar
3cb0283fb6 Documentation cleanup and linkage for validator 2010-01-19 11:29:01 +11:00
Mikel Lindsaar
9aee365924 Adding ActiveModel::Validations documentation 2010-01-18 18:29:33 +11:00
Mikel Lindsaar
91c38403be Adding documentation for ActiveModel::Translation 2010-01-18 18:13:49 +11:00
Mikel Lindsaar
71328a9856 Fixing up state machine docs 2010-01-18 17:20:25 +11:00
Gavin Stark
6e45bf53fb Fixing documentation on ActiveModel::Observer#observed_classes 2010-01-18 00:21:45 -05:00
Nestor Ovroy
aa8cbb79dc Partial Documentation for ActiveModel::StateMachine 2010-01-18 14:54:02 +10:00
Samuel Elliott
31ea83eb89 Adding Proc support to validation messages so that they can become a little more dynamic, allowing for customisations during the request [#3514 status:resolved].
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-17 14:40:10 +01:00
Mikel Lindsaar
a6831b95d6 Updating ActiveModel::Errors documentation to plug Translations and Validations modules 2010-01-17 20:22:14 +11:00
Mikel Lindsaar
19814df40d Adding documentation for ActiveModel::Serialization 2010-01-17 20:14:14 +11:00
José Valim
afd0c06dfa Validates needs hash slice. 2010-01-17 09:57:16 +01:00
Mikel Lindsaar
e6063282f9 Fixing documentation for ActiveModel::Observer 2010-01-17 19:12:12 +11:00
Mikel Lindsaar
fbc7c2beca Adding ActiveModel::Naming documentation 2010-01-17 15:52:33 +11:00
Mikel Lindsaar
87bd8c803b Update errors docs 2010-01-17 15:41:41 +11:00
Mikel Lindsaar
cf55e4e382 Added documentation for ActiveModel::Lint 2010-01-17 15:35:18 +11:00
Mikel Lindsaar
4d4bdb0766 Added ActiveModel::Errors documentation 2010-01-17 15:17:54 +11:00
Mikel Lindsaar
6f663addaa Merge branch 'master' of github.com:lifo/docrails 2010-01-17 12:46:51 +11:00
Mikel Lindsaar
8834b2612b Adding ActiveModel::AttributeMethods documentation 2010-01-17 12:42:53 +11:00
Pratik Naik
dba196cb7f Merge docrails 2010-01-17 03:26:20 +05:30
Pratik Naik
b04230e3bb Merge remote branch 'mainstream/master'
Conflicts:
	actionpack/lib/action_controller/metal/flash.rb
2010-01-17 03:20:30 +05:30
Mikel Lindsaar
e1c15d9fa1 fixed column alignment 2010-01-16 23:09:32 +11:00
Mikel Lindsaar
4a2d2ef91a Adding RDoc for active_model dirty 2010-01-16 23:03:20 +11:00
Mikel Lindsaar
db274a02ed Fixed readme for ActiveModel::Dirty 2010-01-16 22:21:07 +11:00
Mikel Lindsaar
d1bedd182b Updated README 2010-01-15 10:01:40 +11:00
Mikel Lindsaar
23e434f08f ActiveModel::Conversion documentation 2010-01-15 08:29:08 +11:00
Mikel Lindsaar
582228e435 ActiveModel::Callbacks documentation 2010-01-15 08:19:53 +11:00
José Valim
b078f7fd39 Fix typos and add tests to ensure they will be caught the next time. 2010-01-11 23:38:35 +01:00
José Valim
017f5d5308 Fix typo by renaming :genre to :gender. 2010-01-09 00:18:07 +01:00
José Valim
7045c4c279 Allow validates to map some types to specific options. So now you can do:
validates :email, :presence => true, :format => /@/
  validates :genre, :inclusion => %w(m f)
  validates :password, :length => 6..20
2010-01-08 21:36:04 +01:00