Commit Graph

525 Commits

Author SHA1 Message Date
Charlie Somerville
cab18f1607 allocate less objects 2014-04-29 19:06:19 +10:00
Charlie Somerville
7a04473603 Fewer object allocations
Conflicts:
	activemodel/lib/active_model/attribute_methods.rb
2014-04-29 19:06:19 +10:00
Charlie Somerville
e6fab3aba1 Cheaper attribute_method_matchers
Conflicts:
	activemodel/lib/active_model/attribute_methods.rb
2014-04-29 19:06:19 +10:00
Jeremy Kemper
3f0f6047ab Fix require for class_attribute 2014-04-29 19:06:19 +10:00
Charlie Somerville
6a5c4448bf respond_to? 2014-03-19 21:11:45 +11:00
Charlie Somerville
ec4d0a393c use builder ~> 3.2.0 2014-02-04 22:12:35 +11:00
Aman Gupta
9bb043d718 Merge remote-tracking branch 'upstream/3-0-stable' into 3-0-github 2013-03-05 19:00:12 -08:00
joernchen of Phenoelit
2dfd51247f Fix issue with attr_protected where malformed input could circumvent
protection

Fixes: CVE-2013-0276

Conflicts:
	activemodel/lib/active_model/attribute_methods.rb
	activerecord/test/cases/mass_assignment_security_test.rb
2013-02-09 15:56:49 -08:00
Aaron Patterson
b875be03b5 bumping to 3.0.20 2013-01-28 12:47:48 -08:00
Carlos Antonio da Silva
e5f4a397ed Update changelogs with release dates and minor improvements [ci skip] 2013-01-09 22:06:21 -02:00
Zach Moazeni
477f0e7981 Methods that return nil should not be considered YAML
This is a direct port of @jaw6's pull request
https://github.com/rails/rails/pull/492. His cleanly applied to Rails
v3.1 and v3.2, and this cleanly applies to v3.0.

With yesterday's security patches
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
there is now an issue with Rails v3.0 serving XML to any of the latest
versions of ActiveResource.

Without this, Rails v3.0 can serve XML to ActiveResource consumers that
will see `Hash::DisallowedType: Disallowed type attribute: "yaml"`
2013-01-09 17:34:43 -05:00
Aaron Patterson
7909e7f10c bumping version 2013-01-08 11:13:57 -08:00
Aaron Patterson
fb06fe48ef bumping to 3.0.18 2012-12-23 14:30:59 -08:00
Aaron Patterson
826548b80a updating changelogs 2012-12-23 11:30:36 -08:00
Santiago Pastorino
77977f34a5 Bump to 3.0.17 2012-08-09 16:17:08 -03:00
Santiago Pastorino
6eda26a238 Add CHANGELOG entries 2012-08-09 16:09:22 -03:00
Aman Gupta
7e8b4f108b upgrade gem requirements 2012-08-02 18:57:18 -07:00
Aaron Patterson
3166606dcb bumping to 3.0.16 2012-07-26 14:59:39 -07:00
Aaron Patterson
4a0370b6b8 updating release date 2012-07-26 14:57:45 -07:00
Aaron Patterson
32b4cbc856 updating changelogs 2012-07-23 14:38:48 -07:00
Aaron Patterson
def75432c9 3.0.15 2012-06-12 20:05:46 -07:00
Aaron Patterson
4be9dbff20 updating changelogs 2012-06-12 14:05:21 -07:00
Aaron Patterson
3fb762a9fa bumping to 3.0.14 2012-06-11 16:08:58 -07:00
Aaron Patterson
2c959633f7 bumping versions in the CHANGELOG 2012-06-11 16:02:50 -07:00
Aaron Patterson
7102fe8d44 bumping to 3.0.13 2012-05-31 10:55:00 -07:00
Aaron Patterson
86c97e1af3 updating CHANGELOGs 2012-05-31 10:54:26 -07:00
Aaron Patterson
88e7f5176c bumping to 3.0.13.rc1 2012-05-28 11:48:02 -07:00
Aaron Patterson
9d6377ed73 bumping to 3.0.12 2012-03-01 09:22:25 -08:00
Aaron Patterson
2935435d70 updating RAILS_VERSION 2012-02-22 13:31:26 -08:00
Jon Leighton
67b6847e09 Merge commit 'v3.0.11' into 3-0-stable 2012-02-22 20:20:29 +00:00
Arun Agrawal
be8485e77d ActiveModel confirmation validator fix fixes #1152
If you have an ActiveModel class that has a 
method email_address_confirmation. 
This method is being overwritten by the 
method defined in the Confirmation validator.
2011-11-30 16:09:13 +05:30
Jon Leighton
66a4beb0c9 Preparing for 3.0.11 release 2011-11-18 01:19:17 +00:00
Guillermo Iguaran
5c10a535a5 Updating changelogs in 3-0-stable 2011-09-08 13:42:06 -05:00
Aaron Patterson
4f15f39260 bumping rails to 3.0.10 2011-08-16 15:10:17 -07:00
Aaron Patterson
521c9aa6a8 bumping to 3.0.10.rc1 2011-08-04 17:09:46 -07:00
Aaron Patterson
9d17458544 more changelog updates 2011-08-04 17:08:11 -07:00
Aaron Patterson
15e2b5887f Preparing for 3.0.9 release 2011-06-16 12:03:00 +02:00
Aaron Patterson
6824c5d1d3 Preparing for 3.0.9.rc5 release 2011-06-12 14:28:06 -07:00
Aaron Patterson
f283194234 bumping to rc4 2011-06-12 14:21:20 -07:00
Aaron Patterson
66ec7e84c9 bumping to rc3 since syck is not playing nicely 2011-06-09 15:48:19 -07:00
Aaron Patterson
0e1ecb2e15 bumping to 3.0.9.rc2 2011-06-09 15:36:44 -07:00
Aaron Patterson
0c1608c4ed bumping to 3.0.9.rc1 2011-06-08 14:17:03 -07:00
Aaron Patterson
54d262f6df Merge branch '3-0-8' into 3-0-stable
* 3-0-8:
  bumping to 3.0.8
  Do not modify a safe buffer in helpers
  Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
2011-06-07 16:57:31 -07:00
Aaron Patterson
b341e45d8e bumping to 3.0.8 2011-06-07 16:51:58 -07:00
Vijay Dev
13c8ed3ec0 fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-06-06 20:21:20 +05:30
Aaron Patterson
ce23c6e47f rebuilding rc because of syck. :'( 2011-05-30 17:06:37 -07:00
Aaron Patterson
f4073d530f bumping to rc3 2011-05-30 12:54:16 -07:00
Aaron Patterson
d75652540e bumping to 3.0.8.rc2 2011-05-27 09:08:06 -07:00
Aaron Patterson
8b0806e1b0 bumping to 3.0.8.rc1 2011-05-25 16:44:35 -07:00
Santiago Pastorino
352daffa4e Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 2011-05-24 16:38:26 -07:00