Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on May 19, 2010
Xavier Noria fxn Merge remote branch 'rails/master' 7f07cc3
Commits on May 20, 2010
Rohit Arondekar rohit Minor typo fix in callbacks.rb of abstract_controller 0244b43
Santiago Pastorino spastorino refactor evals and adds some __FILE__ and __LINE__
Signed-off-by: José Valim <jose.valim@gmail.com>
aacf258
Nick Sieger nicksieger More accurate JRuby gem requirements
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
c0db784
José Valim josevalim Fix typo on rackup test (ht: pleax) 048cf9e
Commits on May 21, 2010
Rohit Arondekar rohit Getting Started, don't forget to link to yourself if you are adding t…
…o the changelog.
c36374e
Neeraj Singh neerajdotname Replace assert with assert_equal in some test cases
[#4654 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
1bc6b43
Neeraj Singh neerajdotname 1.day should respond_to kind_of too
[#4656 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
cc45a10
José Valim josevalim Fix failing test. ad4be3d
Norman Clarke norman Use multibyte proxy class on 1.9, refactor Unicode.
Makes String#mb_chars on Ruby 1.9 return an instance of ActiveSupport::Multibyte::Chars to work around 1.9's lack of Unicode case folding.

Refactors class methods from ActiveSupport::Multibyte::Chars into new Unicode module, adding other related functionality for consistency.

[#4594 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f3abc8a
Commits on May 23, 2010
José Valim josevalim Fix a bug where I18n fallbacks modules where not included in the prop…
…er backend if it was set through config.i18n.backend.
8d5939c
Jeremy Kemper jeremy Missing changelog heading 69a9669
Commits on May 24, 2010
Mislav Marohnić mislav auto_link: support arbitrary URI schemes like "ftp:" and "file:"
recognizes all URI scheme allowed characters, such as colon and period.

[#3494 state:resolved]
133ada6
Mislav Marohnić mislav avoid auto_linking already linked emails; more robust detection of li…
…nked URLs

References #1523  [#1862 state:resolved]  [#3591 state:resolved]

Add test that shows how link text can contain HTML if needed:
the trick is using block form in combination with `raw`.
Let link text be automatically HTML-escaped

[#2017 state:resolved]
8f0b213
Mislav Marohnić mislav cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/…
…Arel
f493f31
Mislav Marohnić mislav move counter_cache tests to a separate file and refactor bfca7d7
Mislav Marohnić mislav fix `reset_counters` to work even with complex class names
e.g. it guesses that a belongs_to association to Namespace::MyModel is
named "my_model", unlike before where it would look up an association
named "namespace::mymodel" and fail.
bc84bd1
José Valim josevalim Fix a bug where responders were not working properly on method override. 59d1c41
Jaime Iniesta jaimeiniesta New rake validate_guides task to validate output/*.html against the W…
…3C Validator
7db557f
Jaime Iniesta jaimeiniesta Merge branch 'w3c_validator' 3391cb9
Jaime Iniesta jaimeiniesta Fixed minor typo on credits 781692d
Jaime Iniesta jaimeiniesta Added info about guides validation to Contribute guide d85b3ef
Jaime Iniesta jaimeiniesta Fixed XHTML on activerecord_validation_callbacks guide 844b195
Santiago Pastorino spastorino translation method for arrays on TranslationHelper module returns an …
…array where values for keys of the form (.|_)html keys are html_safe

[#4675]

Signed-off-by: José Valim <jose.valim@gmail.com>
05c95b5
David Chelimsky dchelimsky Move AV::TC to AV::TC::Behavior [#4678 state:resolved]
- enables alternative testing frameworks to include AV::TC::Behavior
  instead of subclassing AV::TC
- also added tests and code for:
  - test view delegates :notice to request.flash
    - useful since generators generate views that use notice
  - test case doesn't try to include modules that are actually
    classes

Signed-off-by: José Valim <jose.valim@gmail.com>
8e583b6
Santiago Pastorino spastorino Revert "translation method for arrays on TranslationHelper module ret…
…urns an array where values for keys of the form (.|_)html keys are html_safe"

This reverts commit 05c95b5.

Signed-off-by: José Valim <jose.valim@gmail.com>
2b8eb54
Santiago Pastorino spastorino translate method doesn't support arrays anymore and is optimized to b…
…e used with strings or symbols

Signed-off-by: José Valim <jose.valim@gmail.com>
b5f9c88
Commits on May 25, 2010
Jeremy Kemper jeremy HTML safety: fix textarea with nil content d8d38be
Jeremy Kemper jeremy i18n: t() handles single keys returning an Array, also f53a6d8
Santiago Pastorino spastorino Refactor calculation test to remove unneeded SQLite special case.
[#4633]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
47d568e
Santiago Pastorino spastorino Fix test incorrectly using a bare assert to use assert_kind_of
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
78fffac
Ryan Bigg radar Cover more of the Rails initialization process, regarding the interna…
…ls of YourApp::Application inheritance from Rails::Application and more.
2a833d7
Jose Angel Cortinas jacortinas A small rdoc change made on lines 39 and 41 on activesupport/lib/acti…
…ve_support/core_ext/object/to_param.rb. It looks like the method name might have been changed, and the comments were never changed to coincide with the new method name.
6602fb6
David Chelimsky dchelimsky fix small doc bug about running single unit test files 0855e04
Josiah Ivey josiahivey Form Helpers guide: Use new syntax for fields_for examples 96e2094
Xavier Noria fxn get railties/README back to the home page of the API e3549a8
Commits on May 26, 2010
David Chelimsky dchelimsky Support configuration of controller.controller_path on instances of
ActionView::TestCase::TestController without stubs. Just say:

  @controller.controller_path = "path/i/need/for/this/test"

[#4697 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
163152b
Elomar França Adding to_key to ActiveResource objects using ActiveModel::Conversion [
…#4685 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
7bd30b9
David Chelimsky dchelimsky reorganize tests for AV::TC
- decouple tests from the test case class by moving them outside
- split out more TestCase subs as cleaner way of avoiding bleed of
  class level concepts

Signed-off-by: José Valim <jose.valim@gmail.com>
9ae7e93
David Chelimsky dchelimsky In AV::TC, move protect_against_forgery? from the test_case to the
_helper module included in the view.

- ensures that protect_against_forgery? is present when a helper
  included in a partial that is rendered by the template under test
  calls it (which happens in FormTagHelper#extra_tags_for_form, for
  example).

[#4700 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
e02db06
Commits on May 27, 2010
Xavier Noria fxn Merge remote branch 'rails/master' ddec74f
José Valim josevalim Use I18n 0.4.0 f1ae032
Commits on May 28, 2010
Emili Parreno eparreno add <%= to fields_for examples 6330e2a
Gonçalo Silva goncalossilva performance and integration tests inherit from AD, not AC
Signed-off-by: wycats <wycats@gmail.com>
d21aa6d
Commits on May 29, 2010
Michael Koziarski NZKoz Merge commit 'mislav/auto_link' 668f7dd
Michael Koziarski NZKoz Merge commit 'mislav/counter_cache' 564ab47
Yehuda Katz wycats Removing Metal from Rails 3.
If you have existing Metals, you have a few options:
* if your metal behaves like a middleware, add it to the
  middleware stack via config.middleware.use. You can use
  methods on the middleware stack to control exactly where
  it should go
* if it behaves like a Rack endpoint, you can link to it
  in the router. This will result in more optimal routing
  time, and allows you to remove code in your endpoint
  that matches specific URLs in favor of the more powerful
  handling in the router itself.

For the future, you can use ActionController::Metal to get
a very fast controller with the ability to opt-in to specific
controller features without paying the penalty of the full
controller stack.

Since Rails 3 is closer to Rack, the Metal abstraction is
no longer needed.
45e6028
Santiago Pastorino spastorino fix translation test in actionpack [#4701 state:commited]
Signed-off-by: wycats <wycats@gmail.com>
e5a56eb
Yehuda Katz wycats Now that we always return a proxy from mb_chars, even in 1.9, all Str…
…ings coming back from AS are UTF-8.
d7f6f2b
José Valim josevalim Remove the laziness from the middleware stack. 19d8c8c
Commits on May 30, 2010
Yehuda Katz wycats Update template to allow handlers to more cleanly handle encodings (h…
…t: nex3)
0078df6
Yehuda Katz wycats Update CHANGELOG b870dab
José Valim josevalim Add :only and :except to controllers MiddlewareStack. This allows
you to do the following:

  class PostsController < ApplicationController
    use AutheMiddleware, :except => [:index, :show]
  end
9a93844
Commits on May 31, 2010
Emili Parreno eparreno AR validations & callbacks: update callbacks list 82f6758
Santiago Pastorino spastorino rack-test version updated and removed from Gemfile
Signed-off-by: José Valim <jose.valim@gmail.com>
f5104ca
Santiago Pastorino spastorino Unforce i18n from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
1854209
David Heinemeier Hansson dhh Base options cant live in lazy loaded helpers as they then wont be av…
…ailable to set for config
ea037ff
Commits on Jun 01, 2010
Santiago Pastorino spastorino Unforce tzinfo from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
0bed93b
Santiago Pastorino spastorino Unforce builder from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
31e1445
Santiago Pastorino spastorino Unforce memcache from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
5714438
Santiago Pastorino spastorino Unforce text-format from AM
Signed-off-by: José Valim <jose.valim@gmail.com>
0cc4cd0
Xavier Noria fxn revises rdoc of AMo::Error#add [#4738 state:resolved] a0bb1dd
David Heinemeier Hansson dhh Extracted String#truncate from TextHelper#truncate [DHH] d57397c
David Heinemeier Hansson dhh Merge branch 'master' of github.com:rails/rails cae2519
Xavier Noria fxn AS guide: documents String#truncate 158473f
José Valim josevalim Add lib to load paths when application is inherited to be able to loa…
…d lib code during configuration.
5a0d73f
Xavier Noria fxn revises the documentation of String#truncate and the truncate helper 315e895
Xavier Noria fxn Merge remote branch 'docrails/master' fdd203f
Commits on Jun 02, 2010
Josiah Ivey josiahivey Guides: Give code container a proper bottom margin 4b71fc2
Josiah Ivey josiahivey Revert "Guides: Give code container a proper bottom margin"
This reverts commit 4b71fc2.
3633cb8
José Valim josevalim Still copy application configuration to generator even if they are re…
…quired earlier. Also tidy up the guide a little bit.
afc1026
José Valim josevalim Configure generators before invoking. 0570720
Pratik lifo Special treatement for Relation#select { with block } 4b91daf
Yehuda Katz wycats Merge branch 'master' of github.com:rails/rails 26c5680
Emili Parreno eparreno Routing: fix error in nested resources with name_prefix example [#146
…state:resolved]
785caba
Emili Parreno eparreno AR validations: update sections 2.4 and 17.1 344a695
Yehuda Katz wycats Changes made while working on upgrading cells to Rails 3 ffe001f
David Heinemeier Hansson dhh You need the ruby-debug available in your Gemfile for debugger to work 0251291
David Heinemeier Hansson dhh Merge branch 'master' of github.com:rails/rails 942fe65
David Heinemeier Hansson dhh Extract assets paths and make them available to Action Mailer as well 631dc61
José Valim josevalim Add an asset_host accessor for consistency. 71375c8
David Heinemeier Hansson dhh Missed the extraction 4aac5fd
David Heinemeier Hansson dhh Merge branch 'master' of github.com:rails/rails 3a066e8
Commits on Jun 03, 2010
Rohit Arondekar rohit Minor typo fix in callbacks.rb of abstract_controller e3b04f3
Rohit Arondekar rohit Getting Started, don't forget to link to yourself if you are adding t…
…o the changelog.
464ebb7
Jaime Iniesta jaimeiniesta New rake validate_guides task to validate output/*.html against the W…
…3C Validator
14602b1
Jaime Iniesta jaimeiniesta Fixed minor typo on credits ee71f74
Jaime Iniesta jaimeiniesta Added info about guides validation to Contribute guide d5e9707
Jaime Iniesta jaimeiniesta Fixed XHTML on activerecord_validation_callbacks guide 8ce954d
Ryan Bigg radar Cover more of the Rails initialization process, regarding the interna…
…ls of YourApp::Application inheritance from Rails::Application and more.
22a32f4
Jose Angel Cortinas jacortinas A small rdoc change made on lines 39 and 41 on activesupport/lib/acti…
…ve_support/core_ext/object/to_param.rb. It looks like the method name might have been changed, and the comments were never changed to coincide with the new method name.
9e8de7d
David Chelimsky dchelimsky fix small doc bug about running single unit test files e09e0a0
Josiah Ivey josiahivey Form Helpers guide: Use new syntax for fields_for examples 24ac08f
Elomar França Adding to_key to ActiveResource objects using ActiveModel::Conversion [
…#4685 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
15b0947
David Chelimsky dchelimsky reorganize tests for AV::TC
- decouple tests from the test case class by moving them outside
- split out more TestCase subs as cleaner way of avoiding bleed of
  class level concepts

Signed-off-by: José Valim <jose.valim@gmail.com>
70dca37
David Chelimsky dchelimsky In AV::TC, move protect_against_forgery? from the test_case to the
_helper module included in the view.

- ensures that protect_against_forgery? is present when a helper
  included in a partial that is rendered by the template under test
  calls it (which happens in FormTagHelper#extra_tags_for_form, for
  example).

[#4700 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
d6fec21
José Valim josevalim Use I18n 0.4.0 99f8c14
Gonçalo Silva goncalossilva performance and integration tests inherit from AD, not AC
Signed-off-by: wycats <wycats@gmail.com>
8847165
Mislav Marohnić mislav auto_link: support arbitrary URI schemes like "ftp:" and "file:"
recognizes all URI scheme allowed characters, such as colon and period.

[#3494 state:resolved]
f00561e
Mislav Marohnić mislav avoid auto_linking already linked emails; more robust detection of li…
…nked URLs

References #1523  [#1862 state:resolved]  [#3591 state:resolved]

Add test that shows how link text can contain HTML if needed:
the trick is using block form in combination with `raw`.
Let link text be automatically HTML-escaped

[#2017 state:resolved]
533b131
Mislav Marohnić mislav cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/…
…Arel
d2ec9fd
Mislav Marohnić mislav move counter_cache tests to a separate file and refactor 4ab47f5
Mislav Marohnić mislav fix `reset_counters` to work even with complex class names
e.g. it guesses that a belongs_to association to Namespace::MyModel is
named "my_model", unlike before where it would look up an association
named "namespace::mymodel" and fail.
e6b0ea3
Yehuda Katz wycats Removing Metal from Rails 3.
If you have existing Metals, you have a few options:
* if your metal behaves like a middleware, add it to the
  middleware stack via config.middleware.use. You can use
  methods on the middleware stack to control exactly where
  it should go
* if it behaves like a Rack endpoint, you can link to it
  in the router. This will result in more optimal routing
  time, and allows you to remove code in your endpoint
  that matches specific URLs in favor of the more powerful
  handling in the router itself.

For the future, you can use ActionController::Metal to get
a very fast controller with the ability to opt-in to specific
controller features without paying the penalty of the full
controller stack.

Since Rails 3 is closer to Rack, the Metal abstraction is
no longer needed.
ed34652
Santiago Pastorino spastorino fix translation test in actionpack [#4701 state:commited]
Signed-off-by: wycats <wycats@gmail.com>
10f82fd
Yehuda Katz wycats Now that we always return a proxy from mb_chars, even in 1.9, all Str…
…ings coming back from AS are UTF-8.
27939bd
José Valim josevalim Remove the laziness from the middleware stack. 2740943
Yehuda Katz wycats Update template to allow handlers to more cleanly handle encodings (h…
…t: nex3)
fad2901
José Valim josevalim Add :only and :except to controllers MiddlewareStack. This allows
you to do the following:

  class PostsController < ApplicationController
    use AutheMiddleware, :except => [:index, :show]
  end
c3be207
Santiago Pastorino spastorino rack-test version updated and removed from Gemfile
Signed-off-by: José Valim <jose.valim@gmail.com>
f29a8a3
Santiago Pastorino spastorino Unforce i18n from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
de50ba2
David Heinemeier Hansson dhh Base options cant live in lazy loaded helpers as they then wont be av…
…ailable to set for config
19d1d42
David Heinemeier Hansson dhh Extracted String#truncate from TextHelper#truncate [DHH] bd7a27a
Santiago Pastorino spastorino Unforce tzinfo from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
c8e2ec0
Santiago Pastorino spastorino Unforce builder from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
9a53e02
Santiago Pastorino spastorino Unforce memcache from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
f50928d
Santiago Pastorino spastorino Unforce text-format from AM
Signed-off-by: José Valim <jose.valim@gmail.com>
52f9057
Xavier Noria fxn revises rdoc of AMo::Error#add [#4738 state:resolved] 7edc6b0
David Heinemeier Hansson dhh You need the ruby-debug available in your Gemfile for debugger to work a22da40
Yehuda Katz wycats Update CHANGELOG 53efdc2
José Valim josevalim Add lib to load paths when application is inherited to be able to loa…
…d lib code during configuration.
83a58e0
Xavier Noria fxn revises the documentation of String#truncate and the truncate helper f1fa3a3
Emili Parreno eparreno add <%= to fields_for examples 62fd6d8
Emili Parreno eparreno AR validations & callbacks: update callbacks list 943c60d
Xavier Noria fxn AS guide: documents String#truncate a73d6e7
José Valim josevalim Still copy application configuration to generator even if they are re…
…quired earlier. Also tidy up the guide a little bit.
44cb6dc
José Valim josevalim Configure generators before invoking. 8aca1c0
Pratik lifo Special treatement for Relation#select { with block } a975363
Yehuda Katz wycats Changes made while working on upgrading cells to Rails 3 e57dbfe
David Heinemeier Hansson dhh Extract assets paths and make them available to Action Mailer as well 08baa34
David Heinemeier Hansson dhh Missed the extraction 4a6290b
José Valim josevalim Add an asset_host accessor for consistency. ee58876
Mikel Lindsaar mikel Merge branch 'master' of github.com:mikel/rails ab34b7b
Mikel Lindsaar mikel Changing command line API from 'rails blog' to 'rails new blog'.
Also removed the limitation of not being able to call your new server any of
the rails commands (generate, server, dbconsole, console etc) as there is
no longer any ambiguity here.

http://rails.lighthouseapp.com/projects/8994/tickets/4665
06892c3
Mikel Lindsaar mikel Updating guides to new rails initialization process 54249b5
Pratik lifo Properly cache association_collection#scopes calls having arguments 517f709
Commits on Jun 04, 2010
Mikel Lindsaar mikel Missed fixing the banner on the Usage output for Thor 4d23bdb
Mikel Lindsaar mikel Changing command line API from 'rails blog' to 'rails new blog'.
Also removed the limitation of not being able to call your new server any of
the rails commands (generate, server, dbconsole, console etc) as there is
no longer any ambiguity here.

http://rails.lighthouseapp.com/projects/8994/tickets/4665

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
4774680
Mikel Lindsaar mikel Updating guides to new rails initialization process
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
bf83c57
Raimonds Simanovskis rsim create DateTime value with local offset as later it is compared to Ti…
…me value with local offset

(otherwise test is failing for oracle_enhanced JDBC adapter)
eec90ba
Raimonds Simanovskis rsim Explicitly set Topic model last_read attribute as Date value when Ora…
…cle enhanced adapter is used

(otherwise some tests are failing which assume that this attribute will have Date value)
8136230
Raimonds Simanovskis rsim Reduced size of table name prefix and suffix in migrations test as in…
… Oracle identifier name cannot be larger than 30 characters
6356a48
Raimonds Simanovskis rsim Oracle enhanced adapter now supports shortening of default generated …
…index names, some additional tests now pass
f12f377
Raimonds Simanovskis rsim do order by id when finding first fixture to ensure that it is correc…
…t one

(as otherwise was failing under JRuby and oracle_enhanced adapter)
9bf7b63
Raimonds Simanovskis rsim test fixes for Oracle enhanced adapter:
latest oracle_enhanced adapter does automatic shortening of index names
ignore select from all_triggers table in assert_queries
464b7f3
Raimonds Simanovskis rsim downcase table names in aliased_table_name_for and references_eager_l…
…oaded_tables? methods (as Oracle quoted table names are in uppercase)
a83e6b1
Raimonds Simanovskis rsim assert log output match in case insensitive mode to avoid failure whe…
…n quoted table name is in uppercase (when using Oracle)
a82e067
Raimonds Simanovskis rsim fix conditions when DateTime#to_date and DateTime#xmlschema methods a…
…re defined
5fcaf91
Raimonds Simanovskis rsim ignore selects from data dictionary views when running tests on Oracle c6d6b50
Raimonds Simanovskis rsim Fixed adapter tests not to assert LIMIT and OFFSET in SQL strings
Fixed adapter test cases that were failing in oracle because the asserts were looking for the presence of offset and limit which are not available in oracle. Changed the tests to check that the sql injection is not present in the output so that the tests are database adapter agnostic.
05ef038
Raimonds Simanovskis rsim Downcase quoted table name in regex in count_aliases_from_table_joins
Oracle adapter's quote_table_name returns quoted table name in uppercase and therefore it should be downcased before scanning downcased join_sql
edf79a7
Raimonds Simanovskis rsim fix test_belongs_to_with_primary_key_joins_on_correct_column test on …
…Oracle
b0fdd29
Raimonds Simanovskis rsim ignore raw_sql_ table alias that is used by Oracle adapter c51fa6b
Raimonds Simanovskis rsim compare sorted arrays in relations_test
Oracle does not guarantee that SELECT will return records ordered by primary key
acef8fe
Mikel Lindsaar mikel Missed fixing the banner on the Usage output for Thor
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
6401ab5
Xavier Noria fxn removes Array#random_element and backports Array#sample from Ruby 1.9…
…, thanks to Marc-Andre Lafortune
67a4355
Xavier Noria fxn AS guide: removes your spurious line 8e8cb17
Matt Di Pasquale mattdipasquale Improve Rails README [#4740 state:resolved]
Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
1535b02
Rizwan Reza rizwanreza Merge branch 'master' of git://github.com/rails/rails e6f2102
Rizwan Reza rizwanreza Readme file changes:
* Took out stuff that's not relevant (or useful) anymore.
* Some formatting.
* Added helpful links to get started with Rails.
* Took out Apache htaccess tutorial since we aren't teaching Apache here.
55a5c70
Commits on Jun 05, 2010
Jeremy Kemper jeremy Include backtrace in failsafe log. Rescue possible exceptions in fail…
…safe response.
bd98058
Yehuda Katz wycats Improve performance of commonly used request methods ab1407c
Yehuda Katz wycats Use faster form of running callbacks a87b627
Yehuda Katz wycats Eliminate the need to check for superclass changes to the callback st…
…ack each time through the callbacks
220603e
Yehuda Katz wycats Improve performance of the log subscriber by remembering the list of …
…all loggers instead of trying to extract them each time
5fa3a2d
Yehuda Katz wycats Improve performance of MessageVerifier while keeping it constant time 8b05c52
Yehuda Katz wycats Improve performance of the Logger middleware by using simpler version…
…s of methods
67a2d64
Yehuda Katz wycats Whoops. _run_*_callbacks is private a260e02
Yehuda Katz wycats Stop the flash middleware from forcibly loading sessions even if the …
…user doesn't use sessions at all
cb1b2a7
Yehuda Katz wycats Memoizing methods on request means we need to clear them out on recycle! ff4c218
Yehuda Katz wycats No need to unescape params twice if we came from Rack::Mount b8af484
Yehuda Katz wycats Small optimization of 1.9 unescape. We should make sure that inbound …
…ASCII always means UTF-8. It seems so based on a quick survey of common browsers, but let's be sure
16ee4b4
Yehuda Katz wycats Optimize LookupContext a6b3942
Jeremy Kemper jeremy MySQL: require 2.7 or later so we can rely on result.each_hash a5f3f3e
Commits on Jun 06, 2010
Jeremy Kemper jeremy Restore flash sweep 7ace23a
Jeremy Kemper jeremy Bump i18n to 0.4.1 35ae42b
Jeremy Kemper jeremy ActiveSupport::Dependencies.constantize shortcut for caching named co…
…nstant lookups
fd1a504
Jeremy Kemper jeremy Clear const references all at once 9d0d6f7
Jeremy Kemper jeremy Simplify middleware stack lazy compares using named const references 509f3d7
Xavier Noria fxn AS guide: first complete draft covering date/calculations.rb 0dbc732
Jeremy Kemper jeremy Reset request.parameters after assigning params for functional tests 9f93de9
Jeremy Kemper jeremy Formats should always be an array. 83729e2
Commits on Jun 07, 2010
Rizwan Reza rizwanreza Router accepts member routes on resource. [#4624 state:resolved] ac9f8e1
Xavier Noria fxn the order in which we apply deltas in Date#advance matters, add test …
…coverage for that
d96efe6
Xavier Noria fxn oops, two cancelling errors made a previous test pass, fixing it 8c7730d
Santiago Pastorino spastorino Observing module is using constantize b3d2080
José Valim josevalim Make AP test suite green once again and speed up performance in layou…
…ts lookup for some cases.
5273bd9
Tom Meier Require active support/string/conversions so constantize can be used …
…in associations.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
3f1cdb8
Carlos Antonio da Silva carlosantoniodasilva Fixing test class names and refactor line in autosave association
Signed-off-by: José Valim <jose.valim@gmail.com>
7eedc3f
José Valim josevalim Make the logic for nested_records_changed_for_autosave? simpler.
[#4648 state:resolved]
634c931
José Valim josevalim member on resource should not expect an ID. 1a8f784
Xavier Noria fxn Merge remote branch 'rails/master' 9e065c6
Santiago Pastorino spastorino bump sqlite version to 1.3.0
Signed-off-by: Xavier Noria <fxn@hashref.com>
ed16ec6
Xavier Noria fxn getting started guide: mentions that last REE release does not have t…
…he bugs of MRI p248 and p249
9ff6191
Xavier Noria fxn getting started guide: mentions that last REE release does not have t…
…he bugs of MRI p248 and p249
73d8bf2
Rizwan Reza rizwanreza Fixed Load Error failures in 1.9.2-head 3adb395
Yehuda Katz wycats Make named helpers unprotected without becoming actions [#4696 state:…
…resolved]
eebac02
Mikel Lindsaar mikel Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) 735027e
Santiago Pastorino spastorino content_tag_string shouldn't escape_html if escape param is false 399b493
Santiago Pastorino spastorino Makes text_helper methods sanitize the input if the input is not safe…
… or :safe => true option is not provided
ab764ec
Mikel Lindsaar mikel Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit)
Signed-off-by: José Valim <jose.valim@gmail.com>
50031bf
José Valim josevalim Fix case when rendering a partial inside RJS with inherited layout [#…
…4786 state:resolved]
981f812
José Valim josevalim Add delete to middleware stack proxy. a210aff
Yehuda Katz wycats regular expressions are usually ASCII-encoded, so force_encoding the …
…content of a Node to the encoding of the regular expression is wrong.
d6953cb
Mikel Lindsaar mikel Merge branch 'master' of git://github.com/rails/rails a16fd96
José Valim josevalim Really make include_root_in_json default to true [#3770 state:resolved] a04060f
Diego Carrion dcrec1 Add shallow routes to the new router [Closes #3765] 67a60ee
Commits on Jun 08, 2010
Santiago Pastorino spastorino This test shouldn't rely on the order of the data returned by select
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
94ed39d
Santiago Pastorino and José Ignacio Costa update docs before_validation_on_create => before_validation(:on => :…
…create)
100f8b2
Mikel Lindsaar mikel Updating image_tag to support cid:content_id "URLs" 21cc1ed
Mikel Lindsaar mikel Adding inline attachment support to ActionMailer 311d99e
Yehuda Katz wycats If we undef <=>, it solves a problem involving comparison. Please fig…
…ure out the root cause.
0042f41
Yehuda Katz wycats Merge remote branch 'rsim/oracle_enhanced_rails3' b97a3f3
Mikel Lindsaar mikel Updating readme for ActionMailer::Base 3762362
Mikel Lindsaar mikel Updating ActionMailer basics guide to have inline attachments 80a044e
Yehuda Katz wycats Move the undef into the 1.9 only branch 8d576b5
Mikel Lindsaar mikel Merge branch 'master' of git://github.com/rails/rails e404490
Ernie Miller ernie Fix multiple self-referencing eager loads failing to join multiple times
[#4679 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a4eaa1f
Rohit Arondekar rohit Fixed textilize_without_paragraph and added tests for it. [#4792 stat…
…e:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
67f411c
Andrew White pixeltrix Add support for actions on a new resource to the new routing DSL [#4328
… state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
4740fba
José Valim josevalim Hide remaining generators hooks [#4790 state:resolved] aa8b56f
José Valim josevalim Fix generator test broken when rails new was added. 9d33c2a
Rohit Arondekar rohit Made markdown honor :safe option and handle safe input. Also added te…
…sts for markdown.

[#4794 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
47bf19c
Andrew White pixeltrix Fix resources ignoring scope options
Signed-off-by: José Valim <jose.valim@gmail.com>
a7edddf
Prem Sichanugrist sikachu Make sure that rails recognized the full notation of IPv6 loopback ad…
…dress, and recognize 127.0.0.0/8 in IPv4

Signed-off-by: José Valim <jose.valim@gmail.com>
c6ad643
Yehuda Katz wycats Require encoding.rb 068f8d6
Xavier Noria fxn AS guide: documents datetime calculations e7e6ee3
José Valim josevalim Accept both regexps and strings for LOCALHOST. 68b4720
Yehuda Katz wycats Missing require restored 6b49a71
Aaron Patterson tenderlove forcing encoding on 1.9 when dealing with "binary" columns [#4612 sta…
…te:resolved]

Signed-off-by: wycats <wycats@gmail.com>
eb69721
David Heinemeier Hansson dhh Fixed double output from cache in no caching mode 585f8f2
David Heinemeier Hansson dhh Get ready for beta 4 32d4330
Jeremy Kemper jeremy Temporarily revert "Update after_commit and after_rollback docs and t…
…ests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."

This reverts commits d2a49e4 and da840d1.

[#2991]

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/transactions.rb
	activerecord/test/cases/transaction_callbacks_test.rb
1b2941c
Emilio Tagua miloops Bump Arel to 0.4.0
Signed-off-by: José Valim <jose.valim@gmail.com>
d103c73
Emilio Tagua miloops Add parentheses to avoid warnings when running AR tests.
Signed-off-by: José Valim <jose.valim@gmail.com>
ab2877c
Xavier Noria fxn Merge remote branch 'rails/master' 751f79a
David Chelimsky dchelimsky Memoize the object returned by _view in ActionView::TestCase::Behavior
[#4799 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
bdcf70c
Andrew Bloomgarden aughr Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751
…state:resolved]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
0e9b9d5
David Heinemeier Hansson dhh Revert "Add shallow routes to the new router" for now. Needs more work.
This reverts commit 67a60ee.
03be270
Emilio Tagua miloops Avoid PostgreSQL and MySQL tests warnings.
Signed-off-by: José Valim <jose.valim@gmail.com>
4b4a548
José Valim josevalim Bring pg back. e50bf67
Xavier Noria fxn Merge remote branch 'docrails/master' f1c0bcf
Jeremy Kemper jeremy Clarify Fixture#key_ and value_list 87cc3d5
Jeremy Kemper jeremy Revert "Temporarily revert "Update after_commit and after_rollback do…
…cs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction.""

This reverts commit 1b2941c.

[#2991]
b070739
Brian Durand bdurand Make logic for after_commit and after_rollback :on option work like i…
…t does for validation callbacks.

[#2991 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2500e6a
Neeraj Singh neerajdotname cache_sweeper yields blank output
[#3914 state:open]

Signed-off-by: José Valim <jose.valim@gmail.com>
db23a95
Jan De Poorter DefV Make sure namespaces are nested within resources
Signed-off-by: José Valim <jose.valim@gmail.com>
4560385
José Valim josevalim Add more cases to previous commit [#4394 state:resolved] 5c9f27a
Yehuda Katz wycats Update bundler dependency 6ebc7c8
Yehuda Katz wycats Merge branch 'master' of github.com:rails/rails df40dbe