Joe Fiorini
ac5e691153
Enable passing root: false to #to_json
2011-07-01 23:00:13 -04:00
Santiago Pastorino
35cdd256c0
Master version is 3.2.0.beta
2011-06-30 10:18:36 -03:00
Ian Stewart
eafa174bfd
changing an attribute multiple times retains the correct original value
2011-06-28 22:18:24 -07:00
Alexander Uvarov
e945497955
Minor formating fix
2011-06-24 03:52:39 +06:00
Alexander Uvarov
ee044ea547
Follow rails convention by using Array.wrap
2011-06-23 23:06:52 +06:00
Alexander Uvarov
528f405cdc
Allow to specify mass-assignment roles as array
2011-06-23 12:56:39 +06:00
Xavier Noria
146ec2d1df
Merge branch 'master' of git://github.com/lifo/docrails
2011-06-18 10:11:47 +02:00
Santiago Pastorino
5599e3fa0c
Merge pull request #1654 from ganeshkumar/test_cases
...
removed duplicate code in tests
2011-06-13 05:45:47 -07:00
Guillermo Iguaran
657ba2a9f0
Remove trailing whitespaces
2011-06-12 10:31:21 -05:00
ganesh
7c3094626d
removed duplicate code
2011-06-11 21:49:12 +05:30
José Valim
82568bedae
Update CHANGELOG.
2011-06-11 18:03:13 +02:00
José Valim
410a42860b
Get rid of the alternate namespace lookup.
2011-06-11 18:01:26 +02:00
thoefer
0831b7e076
Brought back alternative convention for namespaced models in i18n.
2011-06-08 13:40:17 +02:00
Xavier Noria
5e21247131
Merge branch 'master' of git://github.com/lifo/docrails
...
Conflicts:
activerecord/RUNNING_UNIT_TESTS
2011-06-06 22:23:30 +02:00
Vijay Dev
82aedbb96d
fix incorrect output
2011-06-04 20:12:25 +05:30
Vijay Dev
ced2b25036
use clearer variable name in examples
2011-06-04 02:11:43 +05:30
Vijay Dev
caa8ab09f7
remove stray (
2011-06-03 14:25:13 +05:30
Ben Orenstein
8e071bc068
Change hashrocket spacing to match conventions.
2011-06-02 17:33:48 -04:00
Guillermo Iguaran
698b600719
Don't add .rb in requires
2011-05-31 21:43:04 -05:00
Damien Mathieu
70381cf507
no need for .rb
2011-05-31 23:38:51 +02:00
Damien Mathieu
bb828990bd
string inflections are needed for running tests in isolation
2011-05-31 23:38:39 +02:00
José Valim
12786518f1
Update CHANGELOG.
2011-05-31 12:26:32 +02:00
José Valim
139a9f7011
Transform the symbol into a constant lookup.
2011-05-31 12:24:30 +02:00
Bogdan Gusiev
aa2639e746
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method
...
In order to specify your own sanitize method
Implemented .mass_assignment_sanitizer configuration option
2011-05-30 11:34:00 +03:00
José Valim
0731945e74
Merge pull request #1334 from bogdan/callback
...
MassAssignmentSecurity: add ability to specify your own sanitizer
2011-05-26 11:47:35 -07:00
Bogdan Gusiev
c7567c9a6d
MassAssignmentSecurity: add ability to specify your own sanitizer
...
Added an ability to specify your own behavior on mass assingment
protection, controlled by option:
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
2011-05-26 15:58:43 +03:00
Xavier Noria
00e1d0832e
Merge branch 'master' of git://github.com/lifo/docrails
...
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/core_ext/kernel/requires.rb
2011-05-25 22:48:47 +02:00
Vijay Dev
79e9a2983a
fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0
2011-05-24 23:39:24 +05:30
Sebastian Martinez
2a4b780ab1
Remove extra white spaces on ActiveModel docs.
2011-05-23 20:39:10 -03:00
Joshua Peek
5e519fb015
Merge branch '3-1-stable'
...
Conflicts:
actionpack/actionpack.gemspec
activemodel/activemodel.gemspec
2011-05-22 20:11:36 -05:00
José Valim
06474c1553
Merge pull request #1192 from arunagw/removal_extra
...
No more need rubygems here.
2011-05-22 09:12:27 -07:00
José Valim
9164dda151
Fix I18n dependency as final is out.
2011-05-22 13:39:13 +02:00
José Valim
d5646e842f
Move I18n dependency back to ActiveSupport.
2011-05-22 13:31:19 +02:00
Daniel Schierbeck
93659a3166
Remove superfluous whitespace from ActiveModel::SecurePassword
...
Only one space is needed, yo!
2011-05-22 04:02:47 -07:00
David Heinemeier Hansson
82857adc56
Bump versions for rc1
2011-05-21 20:56:52 -05:00
Arun Agrawal
1ffc3063b7
No more need rubygems here.
2011-05-22 02:02:56 +05:30
Xavier Noria
eb0257944e
Merge pull request #1180 from Karunakar/documentation_change
...
Documentation Error Fixed for ticket #839
2011-05-21 10:39:28 -07:00
José Valim
26703f4905
Merge pull request #1165 from arunagw/rubyforge_remove
...
Not updating rubyforge for new versions.
2011-05-21 04:55:37 -07:00
Ganesh Kumar
3d789ea4b9
ActionMailer deliver method Documentation corrected Ticket #761
2011-05-21 13:55:52 +05:30
Yves Senn
e5429b789d
Specify the name to be used for ActiveModel::Name fixes #1168
...
This patch allows to specify the name of your models independent of the class name.
2011-05-20 16:59:09 +02:00
Arun Agrawal
f72f591c8c
Not updating rubyforge for new versions. Result of "gem list -d rails" is not useful.
2011-05-20 17:43:40 +05:30
Guillermo Iguaran
ec1993c33f
Prefer each instead of for in
2011-05-19 01:25:31 -05:00
Jim Herzberg
fbf99653f1
Attributes with :string type should not be given the type passed in model serialization options. Closes #1058
2011-05-18 15:52:55 -04:00
Akira Matsuda
35c5ccb30c
Remove unneeded merge with default false options
2011-05-16 15:37:44 +09:00
Akira Matsuda
cbe1d2488b
Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it only when needed.
2011-05-16 15:37:44 +09:00
Xavier Noria
d491130236
Merge branch 'master' of git://github.com/lifo/docrails
...
Conflicts:
actionpack/lib/action_view/helpers/date_helper.rb
railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
2011-05-14 11:21:27 +02:00
Sebastian Martinez
21b61a8ac4
Follow code conventions on some tests
2011-05-10 20:58:36 -03:00
Aaron Patterson
134a05adcb
Merge pull request #493 from guilleiguaran/changelog-fixes
...
Merging 3.0.x CHANGELOGs
2011-05-10 10:04:54 -07:00
Guillermo Iguaran
259c749de1
Merging 3.0.x CHANGELOGs
2011-05-10 11:51:35 -05:00
Joshua Wehner
2cef2d411a
Methods that return nil should not be considered YAML
2011-05-10 12:06:09 -04:00
