Skip to content
This repository
  • 9,556 commits
  • 230 files changed
  • 92 comments
  • 65 contributors
This comparison is big! We're only showing the most recent 250 commits
Dec 11, 2010
Ryan Bigg Config guide: add session store config option 92668f6
Ryan Bigg Config guide: add further initializers f0029d0
Ryan Bigg Config guide: Space out initialization events to improve readability 85a940f
Ryan Bigg Add note which links to documentation regarding the types of columns …
…available.
72476b6
Ryan Bigg Config guide: Use bold titles for initializers instead of headings. 8aec8b8
Ryan Bigg Move ActiveModel::Lint::Tests documentation to be above module declar…
…ation so it appears in the API docs for this module.
44f3380
Ryan Bigg mapper.rb: add "options" to make the default-to-namespace-name line r…
…ead better
eb683d7
Ryan Bigg indent code samples for mount doc d3d23e2
Ryan Bigg root route should go at the *top* of the routes file, because it is t…
…he most popular route and should be matched first
d575229
Ryan Bigg root method options are the same as the match method 55a232a
Ryan Bigg Action Controller Overview: Remove dead link to the API docs for filters 6276334
Vijay Dev fixed typos and rephrased few sentences in routing 51202a1
Xavier Noria testing guide: revises explanation of the test macro 01c76d5
Xavier Noria spaces with underscores, I mean 37b9d02
Xavier Noria reviews commit 53bbbcc 9254750
Dec 15, 2010
Ryan Bigg Provide an example for ActionDispatch::Routing::Mapper#scope f5c15a4
paulodeon Updated generator guide for rails commit 7891de8 ee9fea6
Vijay Dev fixed typos and rephrased a few sentences; also removed reference to …
…status codes being located in action_controller/status_codes.rb
8000719
Vijay Dev fixed typos in mailer f840d5c
Ryan Bigg Remove nodoc from FormBuilder because the methods inside are public A…
…PI methods
7e0cc43
Ryan Bigg Fix indentation on the namespace method's documentation 6bf482e
umar for the root route to work, we need to delete the public/index.html.erb
file as well
8fdf531
Ben Mills Added :placeholder option to ActionView::Helpers::FormTagHelper text_…
…field_tag
becb008
Elben Shira It should be ActiveModel::Validator, not ActiveRecord::Validator. 463522a
Ryan Bigg Active Support coreext guide: Logger core extension documentation 3392b56
Aditya Sanghi eternal confusion! fixed doco to inform correctly dfecb3f
Vijay Dev filter_parameter_logging is deprecated in Rails 3. Changed it to conf…
…ig.filter_parameters
34ed401
Vijay Dev fixed font 0a42961
Vijay Dev fixed link to ruby-prof acd716b
Dec 17, 2010
Piotr Sarnacki Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:reso…
…lved]
d1b4f3b
Piotr Sarnacki Use require 'bundler/setup' instead of directly calling Bundler.setup…
… in config/boot.rb
0646c70
Dec 18, 2010
Don Wilson Fixed number_with_precision rounding error [#6182 state:resolved] 177749b
Piotr Sarnacki Use gemspec instead of gem rails in Gemfile f2fc81f
David Heinemeier Hansson Merge branch '3-0-stable' of github.com:rails/rails into 3-0-stable c09c8be
Dec 22, 2010
Piotr Sarnacki Fix activesupport tests. These classes are not used anywhere d4cf636
John Paul Ashenfelter Added a word boundary to uncountable inflection regex for #singulariz…
…e so short inflections like ors do not affect larger words like sponsors [#6093 state:resolved]
cad4f00
Piotr Sarnacki Ensure that uncountable are removed after test 725817e
Santiago Pastorino Avoid Bundler Resolver bug until they solve the issue 053031b
Santiago Pastorino This can make make included javascripts/stylesheets from expansions t…
…o be duplicated

or grow forever if you call register_*_expansion more than once

Fix a Regression introduced here 55b13c5
70dba74
Dec 23, 2010
Xavier Noria API guidelines: RDoc markup documentation has been moved in RDoc 3 bbb2252
Jon Leighton Test to verify that #2189 (count with has_many :through and a named_s…
…cope) is fixed [#2189 state:resolved]
90f55bd
Jon Leighton Fix problem where wrong keys are used in JoinAssociation when an asso…
…ciation goes :through a belongs_to [#2801 state:resolved]
e4b3842
Dec 28, 2010
Xavier Noria complete revision of the Contributing to Ruby on Rails guide
* adds instructions for PostgreSQL
* adds references to mysql2 here and there
* puts documentation contributions on par with code contributions
* adds a section about Rails Contributors
* documents C dependencies for Nokogiri and the database libs
* everything double-checked and revised step by step
* adds a section about warnings in the test suite
* removes section about the Rails wiki
* title and filename renamed
* overall rewording
3b35ff4
Dec 29, 2010
Pratik Make serialized fixtures work again
Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
	activerecord/test/cases/base_test.rb
	activerecord/test/cases/quoting_test.rb
b5dc2a2
Xavier Noria since a lot of people use Ubuntu, document specific aptitude calls fo…
…r some C dependencies in the contrib guide
b9dd3f9
Xavier Noria renames the contrib guide in the index a2ddf5a
Nick Sutterer process_action accepts multiple args, even with Callbacks. 8d1a318
Dec 30, 2010
Xavier Noria contrib_guide.gsub!("aptitude", "apt-get")
It turns out aptitude has been removed from Ubuntu 10.10
and while you can manually install it, apt-get is the
blessed package manager. Google for "aptitude removed
from Ubuntu" for more details. Thanks to Rafael Mendonça
França for pointing this out.
1a26036
Pratik Make sure Model#touch doesn't try to update non existing columns a49a84f
Jan 01, 2011
Prem Sichanugrist Make sure that generator's default banner is showing its namespace
This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install  [options]"
6ae9e9b
Jan 04, 2011
Added one more failing test for bug #6036 af2999d
Use id instead of quoted_id to prevent double quoting. Fixes failing …
…test for bug #6036.
e95b5b3
Pratik Bump rack-test version b7bb795
Jan 05, 2011
fix difference between behaviour of blank and empty
Signed-off-by: José Valim <jose.valim@gmail.com>
05da752
Jan 09, 2011
Larry Sprock Backport tests for subclassed arrays 9bc338e
John Allison Improve select helpers by allowing a selected value of false. This is…
… useful when using a select helper with a boolean attribute, and the attribute is false. (e.g. f.select :allow_comments)
9ab3ceb
bluetrans-deploy use Object#class instead of Object#type 9933859
Мар'ян Крекотень (Marjan Krekoteń) Refactor to handle the X-Cascade without having to raise an exception 117cad8
Jan 10, 2011
bluetrans-deploy primary_key is returned as either string or symbol, in columns loop m…
…ap everything to string
2deaa25
Aaron Patterson calculate to_s on the primary key once 09f3736
Aaron Patterson use SQLite3::VERSION rather than the deprecated class b7e5a64
Raimonds Simanovskis Always return decimal average of integer fields
In previous version if database adapter (e.g. SQLite and Oracle) returned non-String calculated values then type_cast_using_column converted decimal average value of intefer field to integer value. Now operation parameter is always checked to decide which conversion of calculated value should be done.
e1a064a
Aaron Patterson adding to_d to BigDecimal 2cb497b
Jan 11, 2011
Ernie Miller Fix polymorphic belongs_to associationproxy raising errors when loadi…
…ng target.
97eddc0
Jan 12, 2011
Santiago Pastorino CI should run isolated tests 3b9e72b
Santiago Pastorino Allow view in AV::TestCase to access it's controller helpers methods 3f247cb
Josh Kalderimis In AS, only inflector/methods is need in proxy_wrappers.rb, as well a…
…s date, date_time, and time conversions.rb. This fixes an issue when requiring json and AS saying that i18n is also required.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6d5414
Josh Kalderimis Fixed various isolated test missing requires within AS.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
35d5b64
Aaron Patterson sorry, the CI cannot lie to us anymore 4781673
Aaron Patterson reraising should be in the rescue block 20062e7
Aaron Patterson use raise to create exceptions and to set the backtrace 8874733
Aaron Patterson remove locales external to the system before assertion 58f90b2
Santiago Pastorino Reuse the view_context from the controller, this make the test enviro…
…nment more similar to the code applications uses
acecf00
Xavier Noria upgrades RDoc and horo dependencies
RDoc 2.x was missing some stuff, let's align this with master
5de1314
Santiago Pastorino Allow generators nested in more than one level 3667438
Aaron Patterson include_in_memory? should check against @target list in case of new r…
…ecords. [#6257 state:resolved]
10fa49b
Jan 13, 2011
Santiago Pastorino Add missing require 0f5e815
Santiago Pastorino One more missing require f4dcf19
Santiago Pastorino sorry, the CI cannot lie to us anymore (Part II) 460f173
Jan 16, 2011
Aaron Patterson updating sqlite3-ruby => sqlite3 9d87f41
Jon Leighton Added deprecation warning for has_and_belongs_to_many associations wh…
…ere the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
bcbff10
Jan 17, 2011
Aaron Patterson minitest added @__io__, so we should ignore it too a58670b
Jan 18, 2011
Michael Koziarski Use the derived request_method from AD::Request rather than the raw R…
…EQUEST_METHOD from rack.

This takes _method into account so the log shows the method which ActionController sees.
64c1cb3
Aaron Patterson Changing sqlite3-ruby to sqlite3. backporting 8f88a28 to 3-0-stable. 97d4766
Jan 19, 2011
Jamis Buck make TestCaseTest work for pre-1.9 rubies, too fd19ade
Jamis Buck scrub instance variables from test cases on teardown
this prevents test state from accumulating, resulting in leaked
objects and slow tests due to overactive GC.
1e98920
Jamis Buck rein in GC during tests by making them run (at most) once per second
this can provide a significant performance boost during testing, by
preventing the GC from running too frequently.
35984f5
Added a testcase for bug [#5329]
Signed-off-by: José Valim <jose.valim@gmail.com>
b4bc49c
José Valim Solve SystemStackError when changing locale inside ActionMailer [#5329
…state:resolved]
46b23f8
Jamis Buck Revert "rein in GC during tests by making them run (at most) once per…
… second"

This reverts commit 35984f5.
039b807
Jamis Buck Revert "scrub instance variables from test cases on teardown"
This reverts commit 1e98920.
e5664b5
Jamis Buck Revert "make TestCaseTest work for pre-1.9 rubies, too"
This reverts commit fd19ade.
683cb50
Jan 24, 2011
Aaron Patterson Merge remote branch 'jonleighton/deprecate_habtm_attributes-3-0-stabl…
…e' into 3-0-stable

* jonleighton/deprecate_habtm_attributes-3-0-stable:
  Added deprecation warning for has_and_belongs_to_many associations where the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
f420c2e
Jan 28, 2011
Santiago Pastorino Bump mail version up 5f509c2
Jan 30, 2011
Mikel Lindsaar Fix gitignore to ignore tmp/ correctly, credit telemachus 54e72a5
Jan 31, 2011
Michael Koziarski Prepare for the 3.0.4 release 0cbf9b2
José Valim Fix AM tests 0448247
Feb 01, 2011
Michael Koziarski Be sure to javascript_escape the email address to prevent apostrophes…
… inadvertently causing javascript errors.

This fixes CVE-2011-0446
e3dd210
José Valim Ensure render is case sensitive even on systems with case-insensitive…
… filesystems.

This fixes CVE-2011-0449
6f80224
José Valim Use Mime::Type references. ad9d21d
Aaron Patterson limit() should sanitize limit values
This fixes CVE-2011-0448
354da43
Michael Koziarski Change the CSRF whitelisting to only apply to get requests
Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets.  To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header:

 X-CSRF-Token: ...

This fixes CVE-2011-0447
66ce384
Michael Koziarski Make rails.js include the CSRF token in the X-CSRF-Token header with …
…every ajax request.
7b64ade
Akira Matsuda Make before_type_cast available for datetime fields
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c8b7606
Akira Matsuda before_type_cast on Datetime tests for Mysql2Adapter
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4e6a102
Saimon Moore Additionally trigger i18n configuration setup before any eager loading [
#6353 state:resolved]

This handles the case where config.cache_classes is true and classes
are loaded before the I18n load path has had a chance to be populated.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
979f38a
Saimon Moore Ensure I18n setup is only executed once if triggered on eager loading [
…#6353 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
effb582
Feb 02, 2011
Raimonds Simanovskis fix for test_read_attributes_before_type_cast_on_datetime - Oracle ad…
…apter also returns Time value
8a73ebb
Feb 03, 2011
Add a test for 'render :layout'
To make sure it will show block contents if it is placed after 'render
:partial'

[#5557 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
53b0235
Ken Collins The type_cast_calculated_value method will trust DB types before cast…
…ing to a BigDecimal.

[#6365 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
068527b
Feb 04, 2011
Edward Faulkner Fixing ordering of HABTM association deletion [#6191 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e142159
Santiago Pastorino git am is better here d00ed5a
Santiago Pastorino Remove stupid mistake f2d0257
Feb 08, 2011
Aaron Patterson comma limits do not make sense on oracle or pg ff00cd2
Feb 09, 2011
Michael Koziarski Prepare for the 3.0.4 release 1081ea6
Michael Koziarski Merge branch '3-0-4-security' into 3-0-stable 84d608b
Xavier Noria adds RedCloth to the Gemfile, and defines a :doc group 27b8fb5
Josh Kalderimis fix for AS Gzip returning a UTF-8 string in Ruby 1.9 when it is actua…
…lly binary [#6386 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
31690ea
Add missing require 54dca98
Ken Collins Allow limit values to accept an ARel SQL literal. 7530c52
Xavier Noria getting started guide: the generated application README has no extension 01ca46b
Xavier Noria now that the API guidelines are a guide, it is enough to assert that …
…the names of Rails components have a space, no need to say it was checked with David in the past
3306314
Feb 11, 2011
Carlos Antonio da Silva Add missing deprecation require
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
401ee98
Aaron Patterson skip this test on mysql2 as well 4433b50
Aaron Patterson no more text-format for Ruby 1.9 compatibility cab7cb4
Aaron Patterson psych does not emit a space after the type 4dc5505
Feb 12, 2011
Josh Kalderimis Fixes an issue when decoding a json string which looks like a date bu…
…t is invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e605165
Josh Kalderimis Updated the json date regex to recognize xmlschema formatted date tim…
…es during json decoding. [#3031 state:resolved]

Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
73b9e43
Akira Matsuda avoid nil.dup
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
6e04f58
Akira Matsuda do not to_s where you are testing that a string value is stored for t…
…he before_type_cast

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
cb045c0
Carlos Antonio da Silva Add tests showing the LH issue #6381: fields_for with inline blocks a…
…nd nested attributes already persisted

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
640b1f0
Santiago Pastorino Backport fix from master: fields_for with inline blocks and nested at…
…tributes already persisted does not render properly

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4145810
Wojciech Wnętrzak added proper require for ruby-debug19 gem to generated Gemfile
[#6419 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9c6f9c9
Santiago Pastorino Make gem "ruby-debug19" require ruby-debug 22d1fee
Ernie Miller Deprecate Relation#& alias for Relation#merge 66003f5
Feb 13, 2011
Jon Leighton Deprecated support for interpolated association conditions with the :…
…conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
756e70c
Andrew White Fix assert_recognizes with block constraints [#5805 state:resolved] e9ae88a
Andrew White Remove incorrect assert_recognizes example cb9745b
Feb 14, 2011
Andrew White Remove incorrect assert_recognizes example c6ab3d1
Andrew White Add notes on how to override the default :id constraint [#5994 state:…
…resolved]
b4205b4
Andrew White Fix named route helper for routes nested inside deeply nested resources
[#6416 state:resolved]
64ca278
Andrew White Add test to prevent regression on namespace root nested in a resource
[#6389 state:resolved]
abea073
Aaron Patterson Merge remote branch 'jonleighton/deprecate_string_interpolation-3-0-s…
…table' into 3-0-stable

* jonleighton/deprecate_string_interpolation-3-0-stable:
  Deprecated support for interpolated association conditions with the :conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
2b8fad6
Feb 15, 2011
Sergii Boiko fixed broken link to postgresql docs
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e08873f
Joel Nimety GcTime incorrectly checks GC.respond_to?(:total_time), it should chec…
…k GC::Profiler.respond_to?(:total_time)

[#6435 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
0cee303
Feb 16, 2011
handle double pluralization for irregular plurals
[#6363]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e925acb
Timothy N. Tsvetkov Fixed issue #6363, avoid to pluralized already pluralized names and s…
…ingularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case

[#6363 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
149c3d6
Aaron Patterson explicitly anding queries of the same column 41c35ab
Feb 17, 2011
Aaron Patterson updating changelog ff5db18
Feb 18, 2011
Frederick Cheung Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453
…state:committed]

Signed-off-by: Xavier Noria <fxn@hashref.com>
d7b539a
Feb 21, 2011
Aaron Patterson Gem.cache is going to be deprecated, use source_index instead 3ab82d8
Aaron Patterson adding a test case for custom locking ac73f50
Feb 22, 2011
Aaron Patterson silencing deprecation spam 30a0e3f
Kamal Fariz Mahyuddin Fix observer callbacks firing multiple times on descendant instances ee491b0
Aaron Patterson updating to 3.0.5.rc1 ef31b87
Feb 23, 2011
Michael Koziarski Prepend the CSRF filter to make it much more difficult to execute app…
…lication code before it fires.
90aede6
Aaron Patterson observers leak across tests, so rather than modify the object, we sho…
…uld just count the number of times the observer was called
77d4211
Feb 25, 2011
Prem Sichanugrist Make sure that we set `env["action_dispatch.show_exceptions"]`
This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.

(This is the backported version to 3-0-stable)
69c0bad
Prem Sichanugrist Always use ActionDispatch::ShowExceptions middleware [#6462 state:res…
…olved]

This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.

(This is a backported version to 3-0-stable)
2a67e69
Feb 26, 2011
Aaron Patterson prepping for 3.0.5 release ecc6bb5
Aaron Patterson Merge branch '3-0-5' into 3-0-stable
* 3-0-5:
  prepping for 3.0.5 release
ef5e817
Feb 27, 2011
Santiago Pastorino Bump i18n version f7e1703
Santiago Pastorino failing test for i18n key collision with namespaced models d043d20
Santiago Pastorino Revert "Properly interpolate i18n keys in modules [#5572 state:resolv…
…ed]"

This breaks #6448, you should use :"module/class" as key for namespacing
[#6448 state:committed]

This reverts commit 8d14fa8.
f80eea3
Feb 28, 2011
Sven Fuchs Make TranslationHelper#translate use the :rescue_format option in I18…
…n 0.5.0 (backports 896e25e)

Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
1452571
Santiago Pastorino Add a test for passing :rescue_format => nil to #translate
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
ff95f85
Santiago Pastorino javascript_include_tag shouldn't raise if you register an expansion k…
…ey with nil or [] value
4c681f6
Josh Kalderimis updated Time, Date and DateTime current methods in AS to use Time.zon…
…e and not Time.zone_default.

[#6410 state:committed]
9ba0c7e
Josh Kalderimis Updated the AS guides with some information on the difference between…
… Date.today and Date.current.
7180a32
Aaron Patterson use a subclass of AS::TZ for testing html output cdfee85
Mar 02, 2011
Cheah Chu Yeow Fix Action caching bug where an action that has a non-cacheable respo…
…nse always renders a nil response body. It now correctly renders the response body.

Note that only GET and HTTP 200 responses can be cached.

[#6480 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
beec6c8
Santiago Pastorino Add missing versions to CHANGELOGs ea026f1
Santiago Pastorino Add some CHANGELOG entries for 3.0.6 45d5663
Mar 04, 2011
José Valim log and readme should respect --quiet eff41a2
Mar 06, 2011
Andrew White Raise ArgumentError if route name is invalid [#6517 state:resolved] 2437c78
Andrew White Improve testing of cookies in functional tests:
- cookies can be set using string or symbol keys
- cookies are preserved across calls to get, post, etc.
- cookie names and values are escaped
- cookies can be cleared using @request.cookies.clear

[#6272 state:resolved]
e2523ff
Andrew White Report the correct value of nil.id in the exception message
as different ruby implementations may have different values,
for example Rubinius returns 53 for nil.id.

[#6444 state:resolved]
824107b
Mar 09, 2011
Andrew White Filter params that return nil for to_param 8dab7e5
Mar 11, 2011
Xavier Noria Filter sensitive query string parameters in the log [#6244 state:comm…
…itted]

This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens.

Signed-off-by: Xavier Noria <fxn@hashref.com>
434e451
Xavier Noria remove item in CHANGELOG that leaked in a merge c1f2d9b
Mar 12, 2011
adds a couple of missing AS dependencies 30dd123
Santiago Pastorino require 'thread' in order to use Mutex 4a26cd0
Andrew White Fixed a bug when empty? was called on a grouped Relation that wasn't …
…loaded

[#5829 state:resolved]
3a22e74
Andriy Tyurnikov length validation for fixnums
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
01cb81a
Santiago Pastorino Add CHANGELOG entry 'Fix length validation for fixnums' 0d1ca43
Mar 13, 2011
Andrew White Remove invalid test
The test fails on PostgreSQL when trying to load the records as
the comments_count field is not included in the GROUP BY clause.
c2b474a
Mar 16, 2011
Santiago Pastorino Refactor length validation 1cbade3
Josh Kalderimis fixes an issue with number_to_human when converting values which are …
…less than 1 but greater than -1 [#6576 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
7c8a5f5
Santiago Pastorino Add number_to_human CHANGELOG entry cb2c5c5
Robert Pankowecki Fix when database column name has some symbolic characters. [#5818 st…
…ate:resolved]
c75e4ae
Santiago Pastorino Add AMo CHANGELOG entry 665065c
Mar 17, 2011
Santiago Pastorino Sync attribute_methods.rb with master code, tests added
[#6580 state:committed]
691530a
Santiago Pastorino Update CHANGELOG entry 5ec7806
Mar 21, 2011
Iain Hecker Reapply extensions when using except and only b8ff5f0
Aaron Patterson updating ar changelog e508d9e
Aaron Patterson schemas set by set_table_name are respected by the mysql adapter. [#5322
state:resolved]
eb1eac9
Aaron Patterson oops, forgot to commit this test! 66c8c6c
Aaron Patterson escaping binary data encoding when inserting to sqlite3. Thanks Narus…
…e! [#6559 state:resolved]
7222786
Mar 22, 2011
Santiago Pastorino Do not in place modify what table_name returns 7717fc3
Santiago Pastorino Allow to read and write AR attributes with non valid identifiers 1b7b724
Santiago Pastorino use class_eval with a string when it's possible 63dca41
Mar 23, 2011
Murray Steele Failing test case to show that habtm join table contents are removed …
…when a model is destroyed but the destruction is blocked by a before_destroy.
2f30cdc
Murray Steele Make clearing of HABTM join table contents happen in an after_destory…
… callback.

The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded.  Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed.  Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.
5d43977
Adam Meehan Fix before_type_cast for timezone aware attributes by caching convert…
…ed value on write. Also remove read method reload arg on timezone attributes.
0823bbd
Andrew White Fix filter :only and :except with implicit actions
The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.

[#5673 state:resolved]
35de70f
Mar 24, 2011
Josh Kalderimis correction to the outputted controller name in the diagnostics error …
…template, test included

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6b3b89
Mar 26, 2011
Jesse Storimer Correct docs for after_find and after_initialize 9d7ef79
Aaron Patterson fixing whitespace errors. :bomb: 7643dfd
Aaron Patterson adding a test for attributes after type cast. thanks nragaz. :heart: f28b08a
Aaron Patterson refactoring tz to a variable rather than repeating it c9708ad
Aaron Patterson cleaning up typecast test a little 004fc1c
Mar 28, 2011
Jeremy Kemper Cheaper attribute reads and respond_to?. Add underscore-prefixed meth…
…od aliased to the attribute name so it can be overridden but still called internally.
86acbf1
Sebastian Martinez Un-deprecate #reorder method
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
235a414
Aaron Patterson updating AR changelog 90e9f2c
Aaron Patterson bumping version to 3.0.6.rc1 f13fe8f
Mar 29, 2011
Prem Sichanugrist Do not show optional (.:format) block for wildcard route [#6605 state…
…:resolved]

This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default

This commit is the second attempt on fixing the issue, as the regular expression on another commit on `master` was invalid.
2dc297d
Andrew White Change exists? so that it doesn't instantiate records [#6127 state:re…
…solved]
827e5de
Andrew White Delegate any? and many? to scoped 7f098a6
Andrew White Quote find_in_batches ORDER BY clause [#6620 state:resolved] 3ed8a33
José Valim Pass the proper method_name instead of hardcoding to action_name. 4e2bacd
Aaron Patterson Revert "Improve testing of cookies in functional tests:"
This reverts commit e2523ff.
ba117b2
Patrick Bacon Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
03852b6
Mar 30, 2011
Santiago Pastorino Bring back i18n_key to avoid regression e413953
Santiago Pastorino Bring back i18n_key to avoid regression 05f3df3
Aaron Patterson Merge branch 'eager_load_has_one_with_conditions_fix' of https://gith…
…ub.com/baconpat/rails into baconpat-eager_load_has_one_with_conditions_fix

* 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails:
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
1f38cd7
Patrick Bacon Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
d6dbd54
Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
5b8dbb0
Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
0307c53
Aaron Patterson bumping to 3.0.6.rc2 b13be61
Apr 05, 2011
Durran Jordan Destroying records via nested attributes works independent of reject_if:
- When a :_destroy truthiness is provided in the attributes hash, the
  record should get destroyed regardless of the result of the proc or
    method supplied to :reject_if. (If :allow_destroy is true)

[#6006 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
30264bb
Josh Kalderimis remove AM delegating register_observer and register_interceptor to Ma…
…il and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests

Signed-off-by: José Valim <jose.valim@gmail.com>
e6bc818
Aaron Patterson do not return html safe strings from auto_link 61ee344
Aaron Patterson updating CHANGELOG for actionpack 6bb9efe
Aaron Patterson updating CHANGELOG 857ec16
Aaron Patterson bumping version to 3.0.6 38df020
Aaron Patterson Merge branch '3-0-6' into 3-0-stable
* 3-0-6:
  bumping version to 3.0.6
  updating CHANGELOG
  updating CHANGELOG for actionpack
  do not return html safe strings from auto_link
  bumping to 3.0.6.rc2
  Support both conventions for translations for namespaced models.
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
  Bring back i18n_key to avoid regression
  Revert "Improve testing of cookies in functional tests:"
  bumping version to 3.0.6.rc1
  updating AR changelog
3940e34
Apr 14, 2011
André Arko attributes no longer disappear if a tag contains whitespace
old:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>"\n"}

new:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}
b41d8f3
André Arko gsub is not needed (thanks @fxn!) 45683fb
André Arko files are a special case and need whitespace to be significant 3d15019
Stian Grytøyr Fixes performance issue introduced in 3.0.6 (issue #6695) a3639be
Santiago Pastorino Add missing CHANGELOG entries 6bc9dd7
Santiago Pastorino Prepare for the 3.0.7.rc1 release 1787447
Apr 15, 2011
Jon Leighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
ef95df7
Jon Leighton Return nil from read_attribute if _foo is defined, but @attributes ha…
…s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
3609642
Jon Leighton Undo performances regressions I introduced in 36691ac and add test fo…
…r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
ef88c0c
Jon Leighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
364a5d4
Jon Leighton Update CHANGELOG 20354b7
Andrew White Add missing CHANGELOG entries 612afa2
Sebastian Martinez Added missing CHANGELOG entries for 3.0.7
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
de42af7
Santiago Pastorino Prepare for the 3.0.7.rc2 release f96ad0d