Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mislav/rails
head fork: mislav/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jun 28, 2010
@spastorino spastorino Add missing require, Base use deprecate method 06b0d6e
@wycats wycats Fix several known web encoding issues:
* Specify accept-charset on all forms. All recent browsers,
  as well as IE5+, will use the encoding specified for form
* Unfortunately, IE5+ will not look at accept-charset unless
  at least one character in the form's values is not in the
  page's charset. Since the user can override the default
  charset (which Rails sets to UTF-8), we provide a hidden
  input containing a unicode character, forcing IE to look
  at the accept-charset.
* Now that the vast majority of web input is UTF-8, we set
  the inbound parameters to UTF-8. This will eliminate many
  cases of incompatible encodings between ASCII-8BIT and
* You can safely ignore params[:_snowman_]


* Validate inbound text to confirm it is UTF-8
* Combine the whole_form implementations in form_helper_test
  and form_tag_helper_test
@amatsuda amatsuda Use ActiveRecord::Migrator.schema_migrations_table_name instead of ha…
…rdcoding "schema_migrations"

Signed-off-by: Jeremy Kemper <>
@amatsuda amatsuda Avoid "no such table" exception when schema migrations table does not…
… exist

[#4990 state:resolved]

Signed-off-by: Jeremy Kemper <>
@spastorino spastorino Add this rule to run common tests and specifics ones from adapters dir ab96c71
@wycats wycats Small typo 6fe424a
@pacoguzman pacoguzman Added disable_with option description to button_to helper 37c44c8
@pacoguzman pacoguzman Revert commit 37c44c8 Need more research on disable-with and data-att…
@strzalek strzalek Information about new rake task in CHANGELOG
Signed-off-by: José Valim <>
@josevalim josevalim Update CHANGELOGs. dd8b741
@nono nono Strip_tags never ending attribute should not raise a TypeError [#4870

Signed-off-by: José Valim <>
@josevalim josevalim Deprecate the old router DSL. Since it is still used intensively acro…
…ss ActionPack test suite, patches that translates Rails internal tests to the new router DSL are welcome (note though that a few tests shouldn't be translated since they are testing exactly the old mapper API, like the ones in actionpack/test/controller/resource_test.rb and actionpack/test/controller/routing_test.rb)
@pixeltrix pixeltrix Remove invalid conditions from route [#4989 state:resolved]
Signed-off-by: José Valim <>
@rohit rohit Convert instance_variables to symbols before excluding internal vars [#…
…4965 state:resolved]

Signed-off-by: José Valim <>
@pixeltrix pixeltrix Merge :constraints from scope into resource options [#2694 state:reso…

Signed-off-by: José Valim <>
@pixeltrix pixeltrix Restores the escaping of urls generated from hashes. [#4765 state:res…

HTML specifications recommend the escaping of urls in web pages,
which url_for does by default for string urls and consquently
urls generated by path helpers as these return strings.

Hashes passed to url_for are not escaped by default and this
commit reverses this default so that they are escaped.

Undoes the changes of this commit:

Signed-off-by: José Valim <>
@josevalim josevalim Do not trigger the old mapper to avoid deprecation messages. e4f9132
@pixeltrix pixeltrix Add :controller and :action to the list of valid conditions
Signed-off-by: José Valim <>
@josevalim josevalim Tidy up valid conditions in router a bit. 6dfa8d8
@josevalim josevalim Make the sentinel flag for route a bit more robust. b5b42af
@tchandy tchandy Documentation for Array#sample 0175c47
@texel texel test that unknown zones don't store mapping keys

Signed-off-by: Santiago Pastorino <>
Signed-off-by: José Valim <>
@spastorino spastorino Don't store incorrect values in zones_map
[#4942 state:committed]

Signed-off-by: José Valim <>
@jeremy jeremy ETag: use body instead of @body since the method will always return a…
… string
@jeremy jeremy returning -> tap 198ec03
@jeremy jeremy Name compiled render methods 2c4f8aa
@jeremy jeremy Slice new buffer from beginning of old buffer to skip encoding specia…
…l case
@jeremy jeremy Use caller for helpers_dir deprecation warnings f8011e6
@neerajdotname neerajdotname with_exclusive_scope does not work properly if ARel is passed. It doe…
…s work nicely if hash is passed. Blow up if user is attempting it pass ARel to with_exclusive_scope.

[#3838 state:resolved]

Signed-off-by: José Valim <>
Commits on Jun 29, 2010
@spastorino spastorino Remove unneeded reject 093c4ee
@adzap adzap accepts_nested_attributes_for typo 8fbb517
@josevalim josevalim Revert "Name compiled render methods". This caused several failures o…
…n AP test suite for 1.9.2.

This reverts commit 2c4f8aa.
@josevalim josevalim Add scoping and unscoped as the syntax to replace the old with_scope …
…and with_exclusive_scope. A few examples:

* with_scope now should be scoping:


  Comment.with_scope(:find => { :conditions => { :post_id => 1 } }) do
    Comment.first #=> SELECT * FROM comments WHERE post_id = 1


  Comment.where(:post_id => 1).scoping do
    Comment.first #=> SELECT * FROM comments WHERE post_id = 1

* with_exclusive_scope now should be unscoped:

  class Post < ActiveRecord::Base
    default_scope :published => true

  Post.all #=> SELECT * FROM posts WHERE published = true


  Post.with_exclusive_scope do
    Post.all #=> SELECT * FROM posts


  Post.unscoped do
    Post.all #=> SELECT * FROM posts

Notice you can also use unscoped without a block and it will return an anonymous scope with default_scope values:

  Post.unscoped.all #=> SELECT * FROM posts
@josevalim josevalim Tidy up deprecation message for with_exclusive_scope. 417125e
@dtrasbo dtrasbo Remove ActiveRecord::Base#class_name [#379 state:committed]
Signed-off-by: José Valim <>
@neerajdotname neerajdotname splitting a really long line into multiple lines which is easy on eyes
Signed-off-by: José Valim <>
@neerajdotname neerajdotname array subtraction should be faster than iterating over all the elements
Signed-off-by: José Valim <>
@josevalim josevalim Rename _snowman_ to _snowman to be in sync with _method and _csrf_token. caab176
@jeremy jeremy Revert "Revert "Name compiled render methods". This caused several fa…
…ilures on AP test suite for 1.9.2."

This reverts commit 9013227.

minitest was 'running' compiled templates beginning with test!
@josevalim josevalim Push a failing test for issues [#4994] and [#5003]. 67582f0
@josevalim josevalim No need to check if the attribute exists (this is the same behavior a…
…s in 2.3) [#4994 state:resolved] and [#5003 state:resolved]
@pupeno pupeno Fixed error when removing an index from a table name values, which is…
… a reserved word, with test.

Signed-off-by: José Valim <>
@pjb3 pjb3 Replaced statement in comment with an assertion
Signed-off-by: José Valim <>
@pupeno pupeno Test that adding an index also doesn't raise an exception.
[#4809 state:resolved]

Signed-off-by: José Valim <>
@wycats wycats Create a deprecation behavior that triggers a notification for deprec…
…ation notices, and make the behaviors independent of the environment names.

* In Rails 2.3 apps being upgraded, you will need to add the deprecation
  configuration to each of your environments. Failing to do so will
  result in the same behavior as Rails 2.3, but with an outputted warning
  to provide information on how to set up the setting.
* New Rails 3 applications generate the setting
* The notification style will send deprecation notices using
  ActiveSupport::Notifications. Third-party tools can listen in to
  these notifications to provide a streamlined view of the
  deprecation notices occurring in your app.
* The payload in the notification is the deprecation warning itself
  as well as the callstack from the point that triggered the
@wycats wycats _snowman CHANGELOG (dobry pies) b1cc63c
@wycats wycats Add CHANGELOG for new deprecation style c1beeb4
@josevalim josevalim Change :notification to :notify (ht: m4n) 0253bf4
@fxn fxn url_for no longer escapes HTML, the :escape option is also gone
Rationale: url_for is just a path/URL generator, it is the responsability of the caller to escape conveniently HTML needs it, JavaScript needs different escaping, a text mail needs no escaping at all, etc.
@fxn fxn s/escape_once/html_escape/, since html safety is the contract that no…
…w says whether something has to be escaped
@tekin tekin migrations.rb requires active_support/core_ext/module/aliasing [#5008

Signed-off-by: Xavier Noria <>
@tenderlove tenderlove AssociationCollection#create_by_*, find_or_create_by_* work properly …
…now. [#1108 state:resolved]

Signed-off-by: Jeremy Kemper <>
Commits on Jun 30, 2010
@goncalossilva goncalossilva performance tests now working accurately on 1.9, using Ruby with the …
…GCdata patch
@spastorino spastorino We are trying to test that & escapes here not that &amp; is being esc…
…aped, also added a cosmetic change to test_link_tag_with_query_and_no_name

Signed-off-by: Jeremy Kemper <>
@josevalim josevalim Clean up the logic to specify the name and path for action a bit. ccbb3bb
@josevalim josevalim A couple enhancements to the router:
* Allow to use the get :symbol shortcut outside resources scopes as well;

* Fix a bug where :action was not being picked from given options;

* Giving :as option inside a resource now changes just the relative name instead of the full name;
@josevalim josevalim Add missing CHANGELOG items. 13a3690
@jamesmacaulay jamesmacaulay Fix AS::MB::Chars#+ to not alter self [#4646 state:resolved]
Signed-off-by: José Valim <>
@norman norman Update Unicode database to 5.2.0. [#5011 state:resolved]
Signed-off-by: José Valim <>
Alex Muntean Fix ActiveSupport::Multibyte::Chars#slice for empty strings when star…
…ting offset is negative [#4717 state:resolved]

Signed-off-by: José Valim <>
@josevalim josevalim Improve the idiom used in multibyte chars a bit. 9ab8cfc
@bodhi bodhi add note of which configuration option to set in deprecation warning …
…message [#5012 state:resolved]

Signed-off-by: José Valim <>
@wincent wincent docs: note that mail() accepts arbitrary headers
The documentation makes it sound like mail() only accepts a limited
set of headers in the headers hash, but it in fact accepts any
arbitrary headers, and there is a test ("can pass random headers in
as a hash to mail") for it in the test suite.

Signed-off-by: Wincent Colaiuta <>
@jeremy jeremy Support any mysql-like adapter b07e6fd
@fxn fxn Merge remote branch 'rails/master' c63cf7b
@josevalim josevalim Make relation a private method. 57d750e
@chewi chewi Don't remove scheduled destroys when loading an association. [#4642 s…

Signed-off-by: José Valim <>
Commits on Jul 01, 2010
@josevalim josevalim Add the possibility to have several behaviors in AS::Deprecation. e596a8e
@shingara shingara fix failure if behavior is not define and try use the default
Signed-off-by: José Valim <>
@jaimeiniesta jaimeiniesta Fixes README for generated apps with Rails 3 (rails *new* myapp, and …
…Welcome aboard text)
@josevalim josevalim Avoid calls to Rails::Application since this is not the official API.
Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
@jeremy jeremy Bump bundler dependency to 1.0.0.beta.2 or later d7c1057
@rizwanreza rizwanreza Added documentation for usage of associative resources with form_for a6913bf
@spastorino spastorino AS json refactor, move to_json implementation to core_ext and a clean…
…up a bit the code
@tenderlove tenderlove porting session.clear fix to master branch. [#5030 state:resolved]
Signed-off-by: Jeremy Kemper <>
@drogus drogus Unify routes naming by renaming router to routes
Signed-off-by: José Valim <>
@spastorino spastorino Time has it own implementation of xmlschema, now AMo doesn't depend o…
…n TZInfo

[#4979 state:committed]

Signed-off-by: José Valim <>
@spastorino spastorino bump erubis version to 2.6.6 and thor version to 0.13.7
Signed-off-by: José Valim <>
Commits on Jul 02, 2010
@neerajdotname neerajdotname clarifying the comments regarding base_class declaration d10aaef
@josevalim josevalim reload_routes! was still referencing old Rails::Application. 0189fb7
@josevalim josevalim Fix routes with :controller segment when namespaced [#5034 state:reso…
@jeremy jeremy Fix indent aeaa468
@gbuesing gbuesing Time#as_json: use Time#formatted_offset instead of strftime %z direct…
…ive, which is non-standard and inaccurate on some platforms (e.g., Mac OS X).


Signed-off-by: Jeremy Kemper <>
Commits on Jul 03, 2010
@ugisozols ugisozols Changed passed argument to :validate => false in validation skipping …
@spastorino spastorino Time#formatted_offset is defined in core_ext/time/conversions 8cc7463
@spastorino spastorino Refactor move some date, time and date_time methods to */zones and fi…
…xed some requires
@spastorino spastorino Removes the dependency that AMo has on tzinfo
[#4979 state:committed]
@pixeltrix pixeltrix :singular is no longer a valid option for resources [#5037 state:reso…
@pixeltrix pixeltrix Refactor recall parameter normalization [#5021 state:resolved]
Signed-off-by: José Valim <>
@pixeltrix pixeltrix Updated routing guide to reflect the fact that :name_prefix is now :as 547199e
@spastorino spastorino Add a missing require to allow the usage of Array#to_xml 075f8b7
@jeremy jeremy Merge remote branch 'spastorino/master' 070c242
@wincent wincent Fixes for "router" and "routes" terminology
Commit f7ba614 improved the internal consistency of the different
means of accessing routes, but it introduced some problems at the level
of code comments and user-visible strings.

This commit applies fixes on three levels:

Firstly, we remove or replace grammatically invalid constructs such as
"a routes" or "a particular routes".

Secondly, we make sure that we always use "the router DSL" or "the
router syntax", because this has always been the official terminology.

Finally, we make sure that we only use "routes" when referring to the
application-specific set of routes that are defined in the
"config/routes.rb" file, we use "router" when referring on a more
abstract level to "the code in Rails used to handle routing", and we use
"routing" when we need an adjective to apply to nouns such as
"url_helpers. Again this is consistent with historical practice and
other places in the documentation.

Note that this is not a sweep over the entire codebase to ensure
consistent usage of language; it is just a revision of the changes
introduced in commit f7ba614.

Signed-off-by: Wincent Colaiuta <>
Signed-off-by: José Valim <>
Commits on Jul 04, 2010
@zilkey zilkey Added release notes for 3 changes to helpers a7988fc
@pixeltrix pixeltrix Reword routing guide so that we talk about prefixing as a use of :as …
…rather than as a specific prefixing option (which :name_prefix used to be).
@pixeltrix pixeltrix Refactor resource options and scoping. Resource classes are now only …
…responsible for controlling how they are named. All other options passed to resources are pushed out to the scope.

Signed-off-by: José Valim <>
@pixeltrix pixeltrix Fix syntax of routing tests so they actually run
Signed-off-by: José Valim <>
@madjo madjo ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will al…
…ways be true

Signed-off-by: José Valim <>
Patrik Stenmark Adds tests for content negotiation change introduced in dc5300a
Signed-off-by: wycats <>
@spastorino spastorino Avoids deprecation warning running tests 8a09ea6
@spastorino spastorino Move Date#xmlschema to conversions and add a missing require 5bf3294
Commits on Jul 05, 2010
@josevalim josevalim Define a convention for descendants and subclasses.
The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children.

By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
@josevalim josevalim RouteSet should also handle anonymous classes. 6671d9c
@josevalim josevalim Recognize should also work with route is wrapped in a constraint. 8079484
Commits on Jul 06, 2010
@mhayes mhayes Fixed typo in Rails::Generators::Base [#5051 state:resolved] db0530e
@l4u l4u Fixed minor typo app/view to app/views e5c95b1
@neerajdotname neerajdotname added more info about << operation in associations c1fc59c
@neerajdotname neerajdotname Merge branch 'master' of ffdbe56
@fxn fxn documents automatic management of join models in hmt associations, in…
… particular the gotcha that deletion is direct
@pixeltrix pixeltrix Refactor handling of :only and :except options. The rules are:
1. Don't inherit when specified as an option on a resource
2. Don't push into scope when specified as an option on a resource
2. Resources pull in :only or :except options from scope
3. Either :only or :except in nested scope overwrites parent scope

[#5048 state:resolved]

Signed-off-by: José Valim <>
@pixeltrix pixeltrix When a dynamic :controller segment is present in the path add a Regex…
…p constraint that allow matching on multiple path segments.

Using a namespace block isn't compatible with dynamic routes so we
raise an ArgumentError if we detect a :module present in the scope.

[#5052 state:resolved]

Signed-off-by: José Valim <>
Commits on Jul 07, 2010
@pixeltrix pixeltrix Add note about incompatibility of namespace and :controller 0f96cea
@josevalim josevalim Add a test to ensure url helpers are not action methods in ActionMailer. 8735d15
@fxn fxn Merge remote branch 'docrails/master' 64c75d6
@jeremy jeremy Fix setting helpers_path to a string or pathname 81f398b
@tenderlove tenderlove adding some behavioral tests for the sqlite adapter. [#5065 state:res…

Signed-off-by: wycats <>
Ben Somers Fixed gruoped_by_title spelling [#5063 state:committed]
Signed-off-by: Xavier Noria <>
@amatsuda amatsuda whitespace
Signed-off-by: Jeremy Kemper <>
@amatsuda amatsuda Print proper "Usage:" messages for "rails plugin" command
* suppress outputting "Unknown command:" when no command were specified
* output the "Usage:" message when no plugin names were given

[#5043 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Jul 08, 2010
@rohit rohit API Docs: Fixes to the Routing docs dc364fd
@neerajdotname neerajdotname clarifying how to create non standard primary key f6fa6cf
@neerajdotname neerajdotname Merge branch 'master' of 4a1207d
@fxn fxn copy-edits some docs a958793
@neerajdotname neerajdotname This test never runs and it has never run. Since the day this file
was created this test has name not beginning with test_. Also this
test is trying to use has_many on another has_many which is not

Signed-off-by: José Valim <>
@eac eac Mass assignment security refactoring
Signed-off-by: José Valim <>
@joshk joshk minor changes to mass assignment security patch to bring it in line w…
…ith rails standards

Signed-off-by: José Valim <>
@joshk joshk mass_assignment_security moved from AR to AMo, and minor test cleanup
Signed-off-by: José Valim <>
@josevalim josevalim Change documentation for ActiveModel::MassAssignmentSecurity a bit an…
…d make debug always be called since some people may overwrite warn! to add extra behavior even if logger is not available.
@jeremy jeremy Bump bundler to 1.0.0.beta.3 64cee90
@jeremy jeremy Revert "Bump bundler to 1.0.0.beta.3"
(It's not out yet)

This reverts commit 64cee90.
@mislav fix ActiveRecord `destroy_all` so it returns destroyed records
Signed-off-by: Jeremy Kemper <>
@tenderlove tenderlove removing useless code. [#5070 state:resolved]
Signed-off-by: Jeremy Kemper <>
@tenderlove tenderlove moving parse_sqlite_config to the sqlite3_connection method (where it…
… belongs) [#5071 state:resolved]

Signed-off-by: Jeremy Kemper <>
@neerajdotname neerajdotname removing unused method
Signed-off-by: José Valim <>
@joshk joshk removed an old unused method in AR which removed readonly attributes
Signed-off-by: José Valim <>
@strzalek strzalek Removing method before redefining it. It was causing warnings. [#5072

Signed-off-by: José Valim <>
@tchandy tchandy Tests to specify the behaviour of ActiveRecord::Migrator.get_all_vers…
…ions() [#5066 state:resolved]

Signed-off-by: José Valim <>
@metaskills metaskills Fix the #using_limitable_reflections? helper to work correctly by not…
… examining the length of an array which contains false/true, hence always passing. [#4869 state:resolved]

Signed-off-by: José Valim <>
@sudara sudara Allow a PID file to be specified to rails server [#5031 state:resolved]
Signed-off-by: José Valim <>
@gammons gammons Eager loading :through associations will join the :source model if th…
…ere are :conditions. [#2362 state:resolved]

Signed-off-by: José Valim <>
@neerajdotname neerajdotname consolidating updated_at and updated_on
Signed-off-by: José Valim <>
@neerajdotname neerajdotname This patch changes update_attribute implementatino so:
- it will only save the attribute it has been asked to save and not all dirty attributes

- it does not invoke callbacks

- it does change updated_at/on

Signed-off-by: José Valim <>
@norman norman Improve bang method defs, make slice! operate in-place. [#5028 state:…

Signed-off-by: José Valim <>
@josevalim josevalim Improve a bit the code in latest commits. 87f64ef
@neerajdotname neerajdotname reset_counter should work with non-traditional belongs_to and polymor…
…phic belongs_to

[#4984 state:resolved]

Signed-off-by: José Valim <>
@dtrasbo dtrasbo Return from ActiveRecord::Base#attributes= unless value is a hash [#4070

Signed-off-by: José Valim <>
@josevalim josevalim Refactor previous commits a bit. d9ebc76
@norman norman Describe recent changes in Multibyte::Chars. d7ffa3c
Commits on Jul 09, 2010
@jaimeiniesta jaimeiniesta Minor typos: 'built-in' instead of 'built in', 'built into' instead o…
…f 'built in to'
@fxn fxn application.rb: revises the comment for autoload_paths so that is ass…
…umes less from the user, and unifies punctuation
@fxn fxn Merge remote branch 'docrails/master' 2f04c87
@neerajdotname neerajdotname expanding on :uniq option in has_many 44b752b
@fxn fxn revises recent commit related to :uniq => true 86d5c72
@fxn fxn missing article, only seen in github's colored diff by the beard of t…
…he prophet
Commits on Jul 10, 2010
@tenderlove tenderlove adding more behavioral tests for the sqlite adapter 1e1af8f
@jeremy jeremy Revert "Revert "Bump bundler to 1.0.0.beta.3""
It's out for reals!

This reverts commit 951dbf0.
@tenderlove tenderlove behavioral tests for sqlite adapter 51783c0
@tenderlove tenderlove primary key behavioral tests 0bac4c7
@tenderlove tenderlove reducing funcalls, cleaning up primary key methods for sqlite adapter f33ee69
Commits on Jul 11, 2010
@spastorino spastorino Avoid interpreted as grouped expression warnings 16c14f7
@spastorino spastorino Add missing require to use Set 060ca6a
@jaimeiniesta jaimeiniesta Getting started guide: rephrase the paragraph about the root route fo…
…r better understanding
@jaimeiniesta jaimeiniesta Getting started guide: Post validation example is clearer if we do p=…
…; better than p=Post.create;
@spastorino spastorino We need to wait for the final release of bundler for this to make sense 913aeae
Commits on Jul 12, 2010
@spastorino spastorino We shouldn't rely on float comparison, delta added just in case float…
… representation of this values aren't equal
@stevenh512 stevenh512 Removed deprecated |map| block argument from routing docs since it is…
… no longer generated in edge Rails config/routes.rb

Didn't touch plugins guide since I'm not too clear on how routes work in plugins.
@josevalim josevalim Routes should respect namespace even if action is a regexp and just c…
…ontroller is given to to.
@jaimeiniesta jaimeiniesta Getting started guide: typos and changelog cf69a01
@jaimeiniesta jaimeiniesta Merge branch 'master' of 4209cb9
@spastorino spastorino Fixes a regression caused by having mapping options controller and ac…
…tion as blank

Signed-off-by: José Valim <>
@josevalim josevalim Remove old rubygems require. da84c9d
@josevalim josevalim Just add connection management middleware if running in a concurrent …
@tenderlove tenderlove use Hash#each to avoid a second hash lookup 8fb838e
@tenderlove tenderlove these strings do not need to be frozen cee2ff2
@tenderlove tenderlove cleaning up PostgreSQLAdapter#select 7c4e040
Commits on Jul 13, 2010
@tenderlove tenderlove refactor PostgreSQLAdapter#result_as_array to create fewer Range objects c9710a4
@tenderlove tenderlove PostgreSQLAdapter#select_raw fields and results are empty even if ntu…
…ples is 0
@tenderlove tenderlove PostgreSQLAdapter#select_raw use each_with_index to avoid multiple ar…
…ray lookups
@tenderlove tenderlove PostgreSQLAdapter#select_raw removing dead code 2c3aab3
@tenderlove tenderlove our method is modifying the original array, so refactor to use destru…
…ctive methods
@neerajdotname neerajdotname with this fix touch method - does not call validations - doest not ca…
…ll callbacks - updates updated_at/on along with attribute if attribute is provided - marks udpated_at/on and attribute as NOT changed

[#2520 state:resolved]

Signed-off-by: José Valim <>
@josevalim josevalim Tidying up a bit, so update_attribute is not called twice on touch. 3401311
@mislav enable AS::JSON.encode to encode AR::Relation by providing `as_json` …

[#5073 state:resolved]

Signed-off-by: José Valim <>
@subbarao subbarao renaming test name to fix accidently override
[#5076 state:resolved]

Signed-off-by: José Valim <>
@wsc wsc string IDs are now quoted correctly [#5064 state:resolved]
Signed-off-by: José Valim <>
Miles Egan remove size attribute from tag generated by file_field helper [#5084

Signed-off-by: José Valim <>
@khustochka khustochka Added reorder delegation for ActiveRecord::Base(to be able to overwri…
…te the default_scope ordering in the named scope [#5093 state:resolved]

Signed-off-by: José Valim <>
Benjamin Quorning Fixed many references to the old config/environment.rb and Rails::Ini…
@fxn fxn Merge remote branch 'docrails/master' 6d2e4ee
@spastorino spastorino Makes CI builder install --pre version of Bundler, now that bundle in…
…stall works again
@tenderlove tenderlove use constants instead of magic numbers. meow bc35631
@tenderlove tenderlove only loop through all rows and columns once in the postgres adapter 35e3041
@tenderlove tenderlove reducing range comparisons when converting types to sql e35e617
@neerajdotname neerajdotname update_attributes and update_attributes! are now wrapped in a transac…

[#922 state:resovled]

Signed-off-by: José Valim <>
@neerajdotname neerajdotname count method should not take options if it is operated on has_many as…
…sociation which has finder_sql or counter_sql

[#2395 state:resolved]

Signed-off-by: José Valim <>
@fxn fxn AS guides: reword the docs of Enumerable#group_by 00f49c7
@wycats wycats Revert "Improve performance of MessageVerifier while keeping it const…
…ant time"

This reverts commit 8b05c52.
Commits on Jul 14, 2010
@jlewallen jlewallen Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <>
@mhutchin mhutchin Active Record Query Interface Guide: Fixed minor typos. 981258c
@mhutchin mhutchin Active Record Query Interface Guide: Fixed a few typos and made minor…
… changes to improve readability.
@mhutchin mhutchin Active Record Query Interface Guide: Corrected the explanation for th…
…e OFFSET example.
@akaspick akaspick upgrade prototype to be compatible with rails.js [#5109 state:committed]
Signed-off-by: Xavier Noria <>
@fxn fxn AR queying guide: let limit and offset be different numbers to help m…
…aking clear what is what in the explanation, rewords also a bit
@fxn fxn revises the rdoc of update_attributes and update_attributes! to docum…
…ent they are wrapped in a transaction, and adds code comments explaining why
@lifo lifo Style fixes 4a06489
@lifo lifo Remove unintentional API changes. [#1108] d5921cd
@tenderlove tenderlove Let's initialize instance variables in the postgres adapter. 36150c9
@tenderlove tenderlove PostgreSQLAdapter#query bail early if there is no column and dry up o…
…ur conditionals
@tenderlove tenderlove PostgreSQLAdapter#query string interpolation calls to_s for us 8ba14c2
@tenderlove tenderlove remove useless ternary in PostgreSQL adapter 6a53445
@tenderlove tenderlove activerecord tests should inherit from ActiveRecord::TestCase 1db8ed0
Commits on Jul 15, 2010
@tenderlove tenderlove use array intersection for dry / faster code d41a28b
@tenderlove tenderlove primary_key_name already checks for the model_class 955b26a
@wycats wycats Style fixes 3c300b3
@tenderlove tenderlove clean up ||= with an initialized variable and attr_reader 62dd1d8
@fxn fxn layouts and rendering guide: use content_for? instead of the yield or…
… yield idiom
@fxn fxn Merge remote branch 'docrails/master' c7d79a4
@lifo lifo Revert "Style fixes"
This reverts commit 3c300b3.
@jaimeiniesta jaimeiniesta Migrations guide: minor typos corrected 5543e8b
@spastorino spastorino Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from act…
…ion_dispatch vendor
@spastorino spastorino Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfo fcb2301
@strzalek strzalek Bump bundler to 1.0.0.beta.5
[#5102 state:committed]

Signed-off-by: Jeremy Kemper <>
@carlosantoniodasilva carlosantoniodasilva Small fix in cookie docs and trailing whitespaces c09cd19
@spastorino spastorino CI should bundle update instead of install so gems are properly updated ea0bf4e
@fxn fxn AS guide: revised the docs of class_attribute and cattr_* macros 181e0d3
Commits on Jul 16, 2010
David Genord II JoinDependency#graft does not properly set parent join [#5124 state:r…

Signed-off-by: Pratik Naik <>
@lifo lifo Fix data loading from the performance script 130bf3c
@neerajdotname neerajdotname adding proper markup to comment c9630d9
@neerajdotname neerajdotname moving persistence related tests to a new file
Before refactoring test result from AR:
2291 tests, 7180 assertions, 0 failures, 0 errors

After the refactoring test result from AR:
2291 tests, 7180 assertions, 0 failures, 0 errors

Signed-off-by: José Valim <>
@tenderlove tenderlove fixing typeo. thanks bamnet! 1b2824b
@spastorino spastorino Explain how to change javascript default files 041e47b
@nicksieger nicksieger Don't rely on implementation-specific order-dependence of array compa…
…risons in unit tests

Signed-off-by: Santiago Pastorino <>
@spastorino spastorino Adds application.js when app is generated with -J and clear javascrip…
@spastorino spastorino Makes this test don't trust on the speed of execution 79d9e0f
@tenderlove tenderlove use an attr_reader for performance b952470
@tenderlove tenderlove only test for existence of +pool+ once 04ef434
@fxn fxn minor pass to generated code in application.rb related to :defaults ef165b3
@tenderlove tenderlove fixing whitespace errors 2244bb0
@tenderlove tenderlove fixing test file name 7ba54ff
@tenderlove tenderlove adding a test for clearing stale connections 8d17f53
@tenderlove tenderlove unfactoring clear_stale_cached_connections! 42be67e
@spastorino spastorino Makes test use the new config.action_view.javascript_expansions[:defa…
…ults] initialization syntax
Commits on Jul 17, 2010
@josevalim josevalim Add skip_eager_load!, skip_autoload! and friends to path objects. c6e2058
@fxn fxn new guide: API Documentation Guidelines, ported and revised from the …
…docrails github wiki
@fxn fxn Merge remote branch 'docrails/master' 631b956
Commits on Jul 18, 2010
@neerajdotname neerajdotname replacing around with for in the comments for callbacks d1037a4
Commits on Jul 19, 2010
@mislav correct typos in Routing examples bcec0f6
@mislav revise download/installation/support sections in READMEs
 - don't reference ancient gem versions
 - don't link to old API doc subdomains
 - point to GitHub instead of RubyForge
 - point to Lighthouse account for support
@mislav improve Action Pack README
 - revise introductory text
 - list modules contained in the package
 - improve examples
 - remove obsolete `scaffold` and `form` examples
@mislav improve Active Record README
 - revise introductory text
 - improve examples
 - don't claim that Oracle, SQL Server, or DB2 are supported
 - remove lengthy "simple example"